diff options
| author | Sudar <sudar@sudarmuthu.com> | 2014-08-13 10:13:16 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-08-13 10:13:16 +0530 |
| commit | 209446c94416b71821d3aed548152ff7c61b7436 (patch) | |
| tree | 6c53fbae47e31e7551e157861e47ba11442d1a9f | |
| parent | b4f80a1b658e2cdb67e4e02456e477e08d93f959 (diff) | |
Revert "Using CFLAGS_STD and CPPFLAGS_STD"
| -rw-r--r-- | Arduino.mk | 11 | ||||
| -rw-r--r-- | HISTORY.md | 1 | ||||
| -rw-r--r-- | arduino-mk-vars.md | 18 |
3 files changed, 2 insertions, 28 deletions
@@ -931,15 +931,8 @@ else $(call show_config_variable,CFLAGS_STD,[USER]) endif -ifndef CPPFLAGS_STD - CPPFLAGS_STD = -std=c++0x - $(call show_config_variable,CPPFLAGS_STD,[DEFAULT]) -else - $(call show_config_variable,CPPFLAGS_STD,[USER]) -endif - -CFLAGS += $(CFLAGS_STD) $(EXTRA_FLAGS) $(EXTRA_CFLAGS) -CXXFLAGS += -fno-exceptions $(CPPFLAGS_STD) $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) +CFLAGS += $(EXTRA_FLAGS) $(EXTRA_CFLAGS) +CXXFLAGS += -fno-exceptions $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) ASFLAGS += -x assembler-with-cpp LDFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -Wl,--gc-sections -O$(OPTIMIZATION_LEVEL) $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) $(EXTRA_LDFLAGS) SIZEFLAGS ?= --mcu=$(MCU) -C @@ -11,7 +11,6 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Make avr-g++ use CXXFLAGS instead of CFLAGS. (https://github.com/sej7278) - Add: Add information about overriding system libs (Issue #229). (https://github.com/sej7278) - Add: Add information about reporting bugs to the correct project (Issue #231). (https://github.com/sej7278) -- Fix: Create CPPFLAGS_STD variable and add CFLAGS_STD and CPPFLAGS_STD to CFLAGS and CXXFLAGS (http://github.com/ladislas) ### 1.3.4 (2014-07-12) - Tweak: Allow spaces in "Serial.begin (....)". (Issue #190) (https://github.com/pdav) diff --git a/arduino-mk-vars.md b/arduino-mk-vars.md index c49f4a2..28ed27f 100644 --- a/arduino-mk-vars.md +++ b/arduino-mk-vars.md @@ -798,24 +798,6 @@ Defaults to `-std=gnu99` ---- -### CPPFLAGS_STD - -**Description:** - -Flags to pass to the C compiler. - -Defaults to `-std=c++0x` - -**Example:** - -```Makefile -CPPFLAGS_STD = -std=gnu++14 -``` - -**Requirement:** *Optional* - ----- - ### OVERRIDE_EXECUTABLES **Description:** |