edsp: support generic and solver-specific configs

[apt.git] / buildlib / python.mak

diff --git a/buildlib/python.mak b/buildlib/python.mak
index f08ab5563af7ce5f7efa91697020c8df1b97140a..25349daa0e25dd470bc4d774c3897e677376e533 100644 (file)
--- 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 $@
 $(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)
           -o $@ -shared \
           $(filter %.opic,$^) \
           $($(@F)-SLIBS) $(PYTHONLIB)


@@ -58,7 +58,7 @@ endif  # ifdef PYTHONLIB
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.opic: %.cc
        echo Compiling $< to $@
 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
        $(DoDep)
 
 # Include the dependencies that are available