From 6ea2b7b52423eadac2d0c2ba29115b2fa5a4f8bb Mon Sep 17 00:00:00 2001 From: "K. Noel Belcourt" Date: Wed, 28 Nov 2007 02:27:13 +0000 Subject: [PATCH] Fix pathscale rpath issue per Alain Minussi's suggestion. [SVN r41429] --- v2/tools/pathscale.jam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2/tools/pathscale.jam b/v2/tools/pathscale.jam index 26ecf496d..7d2f33234 100644 --- a/v2/tools/pathscale.jam +++ b/v2/tools/pathscale.jam @@ -129,7 +129,7 @@ rule link ( targets * : sources * : properties * ) 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 @@ rule link.dll ( targets * : sources * : properties * ) 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