move -std=c++11 from CXX to new CXXSTD

The hack introduced in aa91826f is replaced with a hopefully better
working "proper" solution with a new variable just for the standard we
use everywhere we use CXXFLAGS.

Git-Dch: Ignore

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 51fbc72fbf2cbf084ecfd088f252203835f93eb6..db83f6dcd19aa7898fe6c5a5cd7479b96ed8acdb 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -8,7 +8,8 @@ PACKAGE_MAIL = @PACKAGE_MAIL@
 # C++ compiler options
 CC = @CC@
 CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -D_FORTIFY_SOURCE=2
-CXX = @CXX@ -std=c++11
+CXX = @CXX@
+CXXSTD = -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

diff --git a/buildlib/library.mak b/buildlib/library.mak
index 03f86811642524390f89c45747e9bcb9d9a9a962..3b66b45459a7a1be8a1ba457699549db108d5274 100644 (file)
--- a/buildlib/library.mak
+++ b/buildlib/library.mak
@@ -58,7 +58,7 @@ $($(LOCAL)-VERSIONSCRIPT):
 $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) $(LIBRARYDEPENDS) $($(LOCAL)-VERSIONSCRIPT)
        -rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null
        echo Building shared library $@
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -Wl,--version-script=$($(@F)-VERSIONSCRIPT) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
+       $(CXX) $(CXXSTD) $(CXXFLAGS) $(LDFLAGS) -Wl,--version-script=$($(@F)-VERSIONSCRIPT) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
           -o $@ $(SONAME_MAGIC)$($(@F)-SONAME) -shared \
           $(filter %.opic,$^) \
           $($(@F)-SLIBS) 
@@ -67,7 +67,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS)
        echo Compiling $< to $@
-       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
+       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/buildlib/program.mak b/buildlib/program.mak
index 71c265f39f08b2edfac35f8a2db10568eb6a980f..d833562d688d06e058ebfdbda5cabfde129bac03 100644 (file)
--- a/buildlib/program.mak
+++ b/buildlib/program.mak
@@ -44,13 +44,13 @@ $(PROGRAM): $($(LOCAL)-BIN)
 # The binary build rule
 $($(LOCAL)-BIN): $($(LOCAL)-OBJS) $($(LOCAL)-MKS)
        echo Building program $@
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
+       $(CXX) $(CXXSTD) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
        echo Compiling $< to $@
-       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(abspath $<)
+       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ $(abspath $<)
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/buildlib/python.mak b/buildlib/python.mak
index f08ab5563af7ce5f7efa91697020c8df1b97140a..18918bb33862924d57fd69854d487d2af7e3269b 100644 (file)
--- a/buildlib/python.mak
+++ b/buildlib/python.mak
@@ -39,7 +39,7 @@ ifndef ONLYSTATICLIBS
 $(LIB)/$(MODULE)module.so: $($(LOCAL)-OBJS)
        -rm -f $(LIB)/$($(@F)-MODULE)module.so* 2> /dev/null
        echo Building shared Python module $@
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
+       $(CXX) $(CXXSTD) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\
           -o $@ -shared \
           $(filter %.opic,$^) \
           $($(@F)-SLIBS) $(PYTHONLIB)
@@ -58,7 +58,7 @@ endif  # ifdef PYTHONLIB
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc
        echo Compiling $< to $@
-       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
+       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) $(PICFLAGS) -o $@ $(abspath $<)
        $(DoDep)
 
 # Include the dependencies that are available

diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak
index 86908700ffbfda6f51baea9c415ff0c65669a627..1b3a4be20157fb71e2a993e630542d8ee9099108 100644 (file)
--- a/buildlib/staticlibrary.mak
+++ b/buildlib/staticlibrary.mak
@@ -50,7 +50,7 @@ endif
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
        echo Compiling $< to $@
-       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $(abspath $<)
+       $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXSTD) $(CXXFLAGS) -o $@ $(abspath $<)
        $(DoDep)
 
 # Include the dependencies that are available