diff options
| author | John Whittington <john@jbrengineering.co.uk> | 2017-09-01 12:42:45 +0000 |
|---|---|---|
| committer | John Whittington <john@jbrengineering.co.uk> | 2017-09-01 12:42:45 +0000 |
| commit | 4c4c9ac2f0d074d9f9ec8d1b2ef82564955513ed (patch) | |
| tree | a893ba606790c386e099794c0eef1bbec33e1024 /Arduino.mk | |
| parent | 62f2d7081511ec2563fb511414a8cf8051e38737 (diff) | |
| parent | 5fcd04cdef9b8378fe0a9cafe426321a62d9bdbd (diff) | |
Merge with upstream
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -19,7 +19,7 @@ # # Original Arduino adaptation by mellis, eighthave, oli.keller # -# Current version: 1.5.2 +# Current version: 1.6.0 # # Refer to HISTORY.md file for complete history of changes # @@ -1045,7 +1045,7 @@ endif ifndef CFLAGS_STD ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1) - CFLAGS_STD = -std=gnu11 -flto -fno-fat-lto-objects + CFLAGS_STD = -std=gnu11 -flto -fno-fat-lto-objects -fdiagnostics-color else CFLAGS_STD = endif @@ -1056,7 +1056,7 @@ endif ifndef CXXFLAGS_STD ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1) - CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics -flto + CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics -flto -fno-devirtualize -fdiagnostics-color else CXXFLAGS_STD = endif @@ -1164,7 +1164,7 @@ endif ######################################################################## # Tools version info -ARDMK_VERSION = 1.5 +ARDMK_VERSION = 1.6 $(call show_config_variable,ARDMK_VERSION,[COMPUTED]) CC_VERSION := $(shell $(CC) -dumpversion) |