[Boost-commit] svn:boost r41429 - trunk/tools/build/v2/tools

From: kbelco_at_[hidden]
Date: 2007-11-27 21:27:13

Author: noel_belcourt
Date: 2007-11-27 21:27:13 EST (Tue, 27 Nov 2007)
New Revision: 41429
URL: http://svn.boost.org/trac/boost/changeset/41429

Log:
Fix pathscale rpath issue per Alain Minussi's suggestion.

Text files modified: 
   trunk/tools/build/v2/tools/pathscale.jam |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/pathscale.jam
==============================================================================
--- trunk/tools/build/v2/tools/pathscale.jam	(original)
+++ trunk/tools/build/v2/tools/pathscale.jam	2007-11-27 21:27:13 EST (Tue, 27 Nov 2007)
@@ -129,7 +129,7 @@
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,-rpath,"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
+    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
 }
 
 # Slight mods for dlls
@@ -140,7 +140,7 @@
 
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,-rpath,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
+    "$(CONFIG_COMMAND)" $(OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
 }
 
 # Declare action for creating static libraries