diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-05-03 16:37:33 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-05-03 17:16:48 +0200 |
| commit | 6d1e8c58350803f2c380a332c13edc4528faa417 (patch) | |
| tree | a7d9a6e99fe6bbb4815e53bd0afb2bf2f93b67e6 /buildtools/wafsamba/samba_utils.py | |
| parent | 0003bb460bf25b894ddb0f864f22feaa25eb49e5 (diff) | |
| download | samba-6d1e8c58350803f2c380a332c13edc4528faa417.tar.gz samba-6d1e8c58350803f2c380a332c13edc4528faa417.tar.bz2 samba-6d1e8c58350803f2c380a332c13edc4528faa417.zip | |
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
Diffstat (limited to 'buildtools/wafsamba/samba_utils.py')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 6 |
1 files changed, 2 insertions, 4 deletions
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 [] |