summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-09-12 01:26:17 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-09-14 15:22:18 +0200
commitaa91826fa7c0cfd1f5ec8f062b9e1b134d65c850 (patch)
tree27906ad5daab01a6f2a66a71ff2cc2297ebe03b9
parent69b7654484c3f16d61f315275abb15cc062d190e (diff)
move std=c++11 from CXXFLAGS to CXX
Setting CXXFLAGS like --coverage on the commandline fails if we set the std too late, so if we set it with the compiler name we set it always first. A bit hacky as it bends the expectation, but seems to work. Git-Dch: Ignore
-rw-r--r--buildlib/environment.mak.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 287205181..bf0edb941 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -8,8 +8,8 @@ PACKAGE_MAIL = @PACKAGE_MAIL@
# C++ compiler options
CC = @CC@
CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2
-CXX = @CXX@
-CXXFLAGS+= @CXXFLAGS@ -std=c++11 -Wall -Wextra
+CXX = @CXX@ -std=c++11
+CXXFLAGS+= @CXXFLAGS@ -Wall -Wextra
CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -Wunsafe-loop-optimizations
CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef
# suggests methods which already have such an attribute