| Index: pylib/gyp/generator/make.py
|
| ===================================================================
|
| --- pylib/gyp/generator/make.py (revision 870)
|
| +++ pylib/gyp/generator/make.py (working copy)
|
| @@ -210,10 +210,10 @@
|
| # - quiet_cmd_foo is the brief-output summary of the command.
|
|
|
| quiet_cmd_cc = CC($(TOOLSET)) $@
|
| -cmd_cc = $(CC.$(TOOLSET)) $(CFLAGS.$(TOOLSET)) $(GYP_CFLAGS) $(DEPFLAGS) -c -o $@ $<
|
| +cmd_cc = $(CC.$(TOOLSET)) $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c -o $@ $<
|
|
|
| quiet_cmd_cxx = CXX($(TOOLSET)) $@
|
| -cmd_cxx = $(CXX.$(TOOLSET)) $(CXXFLAGS.$(TOOLSET)) $(GYP_CXXFLAGS) $(DEPFLAGS) -c -o $@ $<
|
| +cmd_cxx = $(CXX.$(TOOLSET)) $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
|
|
|
| quiet_cmd_alink = AR($(TOOLSET)) $@
|
| cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) $(ARFLAGS.$(TOOLSET)) $@ $(filter %.o,$^)
|
| @@ -229,14 +229,14 @@
|
| # special "figure out circular dependencies" flags around the entire
|
| # input list during linking.
|
| quiet_cmd_link = LINK($(TOOLSET)) $@
|
| -cmd_link = $(LINK.$(TOOLSET)) $(LDFLAGS.$(TOOLSET)) $(GYP_LDFLAGS) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
|
| +cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
|
|
|
| # Shared-object link (for generating .so).
|
| # Set SONAME to the library filename so our binaries don't reference the local,
|
| # absolute paths used on the link command-line.
|
| # TODO: perhaps this can share with the LINK command above?
|
| quiet_cmd_solink = SOLINK($(TOOLSET)) $@
|
| -cmd_solink = $(LINK.$(TOOLSET)) -shared $(LDFLAGS.$(TOOLSET)) $(GYP_LDFLAGS) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
|
| +cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
|
| """
|
| r"""
|
| # Define an escape_quotes function to escape single quotes.
|
|
|