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

Subject: [Boost-commit] svn:boost r80728 - trunk/tools/build/v2/tools
From: blelbach_at_[hidden]
Date: 2012-09-27 20:56:17

Author: wash
Date: 2012-09-27 20:56:16 EDT (Thu, 27 Sep 2012)
New Revision: 80728
URL: http://svn.boost.org/trac/boost/changeset/80728

Log:
Fixing Boost.Build's RPATH support for Pathscale on x86-64. 

Text files modified: 
   trunk/tools/build/v2/tools/pathscale.jam |    14 ++++++++++++--                          
   1 files changed, 12 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	2012-09-27 20:56:16 EDT (Thu, 27 Sep 2012)
@@ -8,6 +8,7 @@
 import toolset : flags ;
 import feature ;
 import type ;
+import os ;
 import common ;
 import fortran ;
 
@@ -54,6 +55,15 @@
 
   # always link lib rt to resolve clock_gettime()
   flags pathscale.link FINDLIBS-SA : rt : unchecked ;
+
+  switch [ os.name ]
+  {
+    case SOLARIS :
+        toolset.flags pathscale.link RPATH_OPTION $(condition) : -Wl,-R, -Wl, : unchecked ;
+
+    case * : # GNU
+        toolset.flags pathscale.link RPATH_OPTION $(condition) : -Wl,-rpath=  : unchecked ;
+  }
 }
 
 # Declare generators
@@ -146,7 +156,7 @@
 
 actions link bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
+    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" $(RPATH_OPTION:E=-Wl,-rpath=)"$(RPATH)" -o "$(<)" "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
 }
 
 # Slight mods for dlls
@@ -157,7 +167,7 @@
 
 actions link.dll bind LIBRARIES
 {
-    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_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)
+    "$(CONFIG_COMMAND)" $(OPTIONS) $(USER_OPTIONS) -L"$(LINKPATH)" $(RPATH_OPTION:E=-Wl,-rpath=)"$(RPATH)" -o "$(<)" -Wl,-soname$(SPACE)-Wl,$(<[1]:D=) -shared "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-SA) -l$(FINDLIBS-ST)
 }
 
 # Declare action for creating static libraries