Jonathan Wakely 310c56
diff -up tools/build/src/tools/gcc.jam.rpath tools/build/src/tools/gcc.jam
Jonathan Wakely 310c56
--- tools/build/src/tools/gcc.jam.rpath	2016-05-27 13:30:01.092192721 -0500
Jonathan Wakely 310c56
+++ tools/build/src/tools/gcc.jam	2016-05-27 13:30:46.686987585 -0500
Jonathan Wakely 310c56
@@ -952,7 +952,7 @@ rule link ( targets * : sources * : prop
Jonathan Wakely 310c56
 
Jonathan Wakely 310c56
 actions link bind LIBRARIES
Jonathan Wakely 310c56
 {
Jonathan Wakely 310c56
-    "$(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)
Jonathan Wakely 310c56
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
Jonathan Wakely 310c56
 }
Jonathan Wakely 310c56
 
Jonathan Wakely 310c56
 
Jonathan Wakely 310c56
@@ -1018,7 +1018,7 @@ rule link.dll ( targets * : sources * :
Jonathan Wakely 310c56
 # Differs from 'link' above only by -shared.
Jonathan Wakely 310c56
 actions link.dll bind LIBRARIES
Jonathan Wakely 310c56
 {
Jonathan Wakely 310c56
-    "$(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)
Jonathan Wakely 310c56
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.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)
Jonathan Wakely 310c56
 }
Jonathan Wakely 310c56
 
Jonathan Wakely 310c56
 rule setup-threading ( targets * : sources * : properties * )