Ticket #223: gcc.jam.diff

gcc.jam

@@ -823 +823 @@
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-
+    "$(CONFIG_COMMAND)" @"@($(<[1]:W).rsp:E=-L"$(LINKPATH:T)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH:T) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK:T)" -o "$(<:T)" $(START-GROUP) "$(>:T)" "$(LIBRARIES:T)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) )"
 }
 
 # Default value. Mostly for the sake of intel-linux that inherits from gcc, but
@@ -872 +871 @@
 # That warning is produced only on some platforms, for whatever reasons.
 actions piecemeal archive
 {
-    "$(.AR)" $(AROPTIONS) rc "$(<)" "$(>)"
+    "$(.AR)" $(AROPTIONS) rc "$(<)" @"@($(<[1]:W).rsp:E="$(>:T)")"
     "$(.RANLIB)" "$(<)"
 }
 
@@ -888 +887 @@
 # Differs from 'link' above only by -shared.
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
+    "$(CONFIG_COMMAND)" @"@($(<[1]:W).rsp:E=-L"$(LINKPATH:T)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH:T) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1]:T)" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>:T)" "$(LIBRARIES:T)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) )"
 }
 
 rule setup-threading ( targets * : sources * : properties * )