Release 1.3~exp3

[apt.git] / buildlib / program.mak

diff --git a/buildlib/program.mak b/buildlib/program.mak
index 71c265f39f08b2edfac35f8a2db10568eb6a980f..1b4a5719a9f2f92296b7052dbc0b30181ebdb7cc 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