From 6d1e8c58350803f2c380a332c13edc4528faa417 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 3 May 2010 16:37:33 +0200 Subject: build: use the waf patterns for RPATH Use the self.env.RPATH variable to set the RPATH for each target. This gives consistent ordering of the link command, ensuring that we don't get rebuilds if we ask for a --targets= build after a normal build. This also means we are now using the RPATH_ST pattern, which means we can potentially support compilers that don't use -Wl,xxx as the command line for rpath support --- buildtools/wafsamba/samba_utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'buildtools/wafsamba/samba_utils.py') diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index b989f91252..335313e5dc 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -64,9 +64,8 @@ def ADD_LD_LIBRARY_PATH(path): def install_rpath(bld): '''the rpath value for installation''' bld.env['RPATH'] = [] - bld.env['RPATH_ST'] = [] if bld.env.RPATH_ON_INSTALL: - return ['-Wl,-rpath=%s/lib' % bld.env.PREFIX] + return ['%s/lib' % bld.env.PREFIX] return [] @@ -74,9 +73,8 @@ def build_rpath(bld): '''the rpath value for build''' rpath = os.path.normpath('%s/%s' % (bld.env.BUILD_DIRECTORY, LIB_PATH)) bld.env['RPATH'] = [] - bld.env['RPATH_ST'] = [] if bld.env.RPATH_ON_BUILD: - return ['-Wl,-rpath=%s' % rpath] + return [rpath] ADD_LD_LIBRARY_PATH(rpath) return [] -- cgit