dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added -std=gnu++11 -fno-threadsafe-statics to CXXFLAGS_STD if we're using Arduino 1.6 to match

Browse source 
upstream (without it compilation seems to fail on OSX). Updated docs.

Also made ARDUINO_LIB_PATH overloadable (as implied by arduino-mk-vars.md) although this is a
pretty niche use-case.
This commit is contained in:
Simon John 2016-07-25 13:13:02 +01:00
parent 77431bf250
commit e4b30603d8
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Arduino.mk
View file

@ -472,8 +472,12 @@ ifndef AVR_TOOLS_PATH
AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin
endif endif
ifndef ARDUINO_LIB_PATH
ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries
$(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) $(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 # 1.5.x platform dependent libs path
ifndef ARDUINO_PLATFORM_LIB_PATH ifndef ARDUINO_PLATFORM_LIB_PATH
@ -1035,7 +1039,11 @@ else
endif endif
ifndef CXXFLAGS_STD ifndef CXXFLAGS_STD
ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1)
CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics
else
CXXFLAGS_STD = CXXFLAGS_STD =
endif
$(call show_config_variable,CXXFLAGS_STD,[DEFAULT]) $(call show_config_variable,CXXFLAGS_STD,[DEFAULT])
else else
$(call show_config_variable,CXXFLAGS_STD,[USER]) $(call show_config_variable,CXXFLAGS_STD,[USER])

2
arduino-mk-vars.md
View file

@ -929,7 +929,7 @@ CFLAGS_STD = = -std=gnu89
Controls, *exclusively*, which C++ standard is to be used for compilation. Controls, *exclusively*, which C++ standard is to be used for compilation.
Defaults to `undefined` Defaults to `undefined` on 1.0 or `-std=gnu++11 -fno-threadsafe-statics` on 1.5+
Possible values: Possible values: