aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2017-07-21 21:26:11 +0100
committerSimon John <git@the-jedi.co.uk>2017-07-21 21:26:11 +0100
commitd1156e8fdf9c49cfd0dace56b8a467b7bbbe798c (patch)
tree5203db944df7fc50b0dc32812e2077603da098ed /Arduino.mk
parentd738cac966f6b02eb4153a32144c2a2a3e5c4715 (diff)
Add -fno-devirtualize to CXXFLAGS_STD to workaround a g++ bug. As this could impact performance we should track when the issue is fixed upstream to remove the flag again (see links from Issue #486)
Enabled colourised diagnostics from avr-gcc We forgot to increase ARDMK_VERSION for the 1.6.0 release
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 0dfe161..50d60ee 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -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)