From 209446c94416b71821d3aed548152ff7c61b7436 Mon Sep 17 00:00:00 2001 From: Sudar Date: Wed, 13 Aug 2014 10:13:16 +0530 Subject: Revert "Using CFLAGS_STD and CPPFLAGS_STD" --- Arduino.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index cff4ee5..d226e6e 100644 --- a/Arduino.mk +++ b/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 -- cgit v1.2.3