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/program.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/program.mak')
| -rw-r--r-- | buildlib/program.mak | 4 |
1 files changed, 2 insertions, 2 deletions
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 |