diff options
| author | Sudar Muthu <sudar@sudarmuthu.com> | 2016-07-25 19:42:23 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-25 19:42:23 +0530 |
| commit | b971b059297e6c762d365f2f5c9e85c4dda612e6 (patch) | |
| tree | 12953b891027613370fa9a231eda454b43d06120 /Arduino.mk | |
| parent | 77431bf2504eaf8cb36ac671ee40ca06c07484fd (diff) | |
| parent | e4b30603d8c846f9b108358c30d564887bfd1878 (diff) | |
Merge pull request #442 from sej7278/master
Change CXXFLAGS_STD to match upstream
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -472,8 +472,12 @@ ifndef AVR_TOOLS_PATH AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin endif -ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries -$(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) +ifndef ARDUINO_LIB_PATH + ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries + $(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) +else + $(call show_config_variable,ARDUINO_LIB_PATH,[USER]) +endif # 1.5.x platform dependent libs path ifndef ARDUINO_PLATFORM_LIB_PATH @@ -1035,7 +1039,11 @@ else endif ifndef CXXFLAGS_STD - CXXFLAGS_STD = + ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1) + CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics + else + CXXFLAGS_STD = + endif $(call show_config_variable,CXXFLAGS_STD,[DEFAULT]) else $(call show_config_variable,CXXFLAGS_STD,[USER]) |