summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-11-19 19:27:09 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-19 19:27:09 +0100
commitc3c77d09651b5bed315c83ebe2354c9d2cb31253 (patch)
tree3fc7e1c78a699acd59b87f8a0835f1700e9438c5
parent6aef1942f441e6e667982b92802907026d8cc7c6 (diff)
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
-rw-r--r--buildlib/environment.mak.in3
-rw-r--r--buildlib/library.mak4
-rw-r--r--buildlib/program.mak4
-rw-r--r--buildlib/python.mak4
-rw-r--r--buildlib/staticlibrary.mak2
5 files changed, 9 insertions, 8 deletions
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 51fbc72fb..db83f6dcd 100644
--- 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 03f868116..3b66b4545 100644
--- 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 71c265f39..d833562d6 100644
--- 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 f08ab5563..18918bb33 100644
--- 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 86908700f..1b3a4be20 100644
--- 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