diff options
| author | ladislas <ladislas@weareleka.com> | 2014-08-13 11:16:16 +0200 |
|---|---|---|
| committer | ladislas <ladislas@weareleka.com> | 2014-08-13 17:52:32 +0200 |
| commit | 51e65b0a081411c57cce77c043f88ea266713417 (patch) | |
| tree | e5a1b3be9e502995c8173e5bbe6e8b891db7c89d /Arduino.mk | |
| parent | 9bef267f62f7399e2bb1114cb1ac4f206e1ead89 (diff) | |
add CFLAGS_STD and CXXFLAGS_STD defaults
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 15 |
1 files changed, 11 insertions, 4 deletions
@@ -925,16 +925,23 @@ ifneq ($(CATERINA),) endif ifndef CFLAGS_STD - CFLAGS_STD = -std=gnu99 + CFLAGS_STD = $(call show_config_variable,CFLAGS_STD,[DEFAULT]) else $(call show_config_variable,CFLAGS_STD,[USER]) endif -CFLAGS += $(EXTRA_FLAGS) $(EXTRA_CFLAGS) -CXXFLAGS += -fno-exceptions $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) +ifndef CXXFLAGS_STD + CXXFLAGS_STD = + $(call show_config_variable,CXXFLAGS_STD,[DEFAULT]) +else + $(call show_config_variable,CXXFLAGS_STD,[USER]) +endif + +CFLAGS += $(CFLAGS_STD) +CXXFLAGS += -fno-exceptions $(CXXFLAGS_STD) ASFLAGS += -x assembler-with-cpp -LDFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -Wl,--gc-sections -O$(OPTIMIZATION_LEVEL) $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS) $(EXTRA_LDFLAGS) +LDFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -Wl,--gc-sections -O$(OPTIMIZATION_LEVEL) SIZEFLAGS ?= --mcu=$(MCU) -C # for backwards compatibility, grab ARDUINO_PORT if the user has it set |