Subject: [Boost-commit] svn:boost r54889 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2009-07-11 10:24:27
Author: vladimir_prus
Date: 2009-07-11 10:24:26 EDT (Sat, 11 Jul 2009)
New Revision: 54889
URL: http://svn.boost.org/trac/boost/changeset/54889
Log:
Approximate -rpath-link for acc.
Text files modified:
trunk/tools/build/v2/tools/acc.jam | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
Modified: trunk/tools/build/v2/tools/acc.jam
==============================================================================
--- trunk/tools/build/v2/tools/acc.jam (original)
+++ trunk/tools/build/v2/tools/acc.jam 2009-07-11 10:24:26 EDT (Sat, 11 Jul 2009)
@@ -66,6 +66,10 @@
flags acc CFLAGS <address-model>64 : +DD64 ;
flags acc LINKFLAGS <address-model>64 : +DD64 ;
+# It is unknown if there's separate option for rpath used only
+# at link time, similar to -rpath-link in GNU. We'll use -L.
+flags acc RPATH_LINK : <xdll-path> ;
+
flags acc CFLAGS <cflags> ;
flags acc C++FLAGS <cxxflags> ;
flags acc DEFINES <define> ;
@@ -89,13 +93,13 @@
actions acc.link bind NEEDLIBS
{
- $(CONFIG_COMMAND) -AA $(LINKFLAGS) -o "$(<[1])" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS)
+ $(CONFIG_COMMAND) -AA $(LINKFLAGS) -o "$(<[1])" -L"$(RPATH_LINK)" -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS)
}
SPACE = " " ;
actions acc.link.dll bind NEEDLIBS
{
- $(CONFIG_COMMAND) -AA -b $(LINKFLAGS) -o "$(<[1])" -Wl,+h$(SPACE)-Wl,$(<[-1]:D=) -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS)
+ $(CONFIG_COMMAND) -AA -b $(LINKFLAGS) -o "$(<[1])" -L"$(RPATH_LINK)" -Wl,+h$(<[-1]:D=) -L$(LIBPATH) -L$(STDLIBPATH) "$(>)" "$(NEEDLIBS)" "$(NEEDLIBS)" -l$(FINDLIBS) $(OPTIONS)
}
actions acc.compile.c