@ -118,7 +118,7 @@
"%s: LD_INPUTS := %s"
"%s: LD_INPUTS := %s"
--- a/tools/gyp/pylib/gyp/generator/make.py
--- a/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
+++ b/tools/gyp/pylib/gyp/generator/make.py
@@ -154,6 +154 ,32 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOL
@@ -156,6 +156 ,32 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOL
quiet_cmd_link = LINK($(TOOLSET)) $@
quiet_cmd_link = LINK($(TOOLSET)) $@
cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
cmd_link = $(LINK.$(TOOLSET)) -o $@ $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
@ -151,7 +151,7 @@
# We support two kinds of shared objects (.so):
# We support two kinds of shared objects (.so):
# 1) shared_library, which is just bundling together many dependent libraries
# 1) shared_library, which is just bundling together many dependent libraries
# into a link line.
# into a link line.
@@ -198,6 +224 ,32 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET))
@@ -200,6 +226 ,32 @@ cmd_alink = rm -f $@ && $(AR.$(TOOLSET))
quiet_cmd_alink_thin = AR($(TOOLSET)) $@
quiet_cmd_alink_thin = AR($(TOOLSET)) $@
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
@ -184,7 +184,7 @@
# Due to circular dependencies between libraries :(, we wrap the
# Due to circular dependencies between libraries :(, we wrap the
# special "figure out circular dependencies" flags around the entire
# special "figure out circular dependencies" flags around the entire
# input list during linking.
# input list during linking.
@@ -1768,21 +1820 ,35 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
@@ -1809,21 +1861 ,35 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
self.flavor not in ("mac", "openbsd", "netbsd", "win")
self.flavor not in ("mac", "openbsd", "netbsd", "win")
and not self.is_standalone_static_library
and not self.is_standalone_static_library
):
):