Revert "Using CFLAGS_STD and CPPFLAGS_STD"
This commit is contained in:
parent
b4f80a1b65
commit
209446c944
3 changed files with 2 additions and 28 deletions
11
Arduino.mk
11
Arduino.mk
|
@ -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)
|
||||
|
|
|
@ -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:**
|
||||
|
|
Loading…
Reference in a new issue