From c3c77d09651b5bed315c83ebe2354c9d2cb31253 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 19 Nov 2015 19:27:09 +0100 Subject: 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 --- buildlib/program.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildlib/program.mak') 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 -- cgit v1.2.3-70-g09d2