diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-11-19 19:27:09 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-11-19 19:27:09 +0100 |
| commit | c3c77d09651b5bed315c83ebe2354c9d2cb31253 (patch) | |
| tree | 3fc7e1c78a699acd59b87f8a0835f1700e9438c5 /buildlib/library.mak | |
| parent | 6aef1942f441e6e667982b92802907026d8cc7c6 (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
Diffstat (limited to 'buildlib/library.mak')
| -rw-r--r-- | buildlib/library.mak | 4 |
1 files changed, 2 insertions, 2 deletions
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 |