diff options
author | Andrew Tridgell <tridge@samba.org> | 2010-03-23 10:00:48 -0400 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:01 +1000 |
commit | 3e84e10daf7282c61b6a557a8e97af84d8ab3e15 (patch) | |
tree | b56a41be1d50c736c9464339a6c9bc336b400e4b /buildtools/wafsamba/samba_utils.py | |
parent | 9730166fd6111160dc7925785317208f94fc677c (diff) | |
download | samba-3e84e10daf7282c61b6a557a8e97af84d8ab3e15.tar.gz samba-3e84e10daf7282c61b6a557a8e97af84d8ab3e15.tar.bz2 samba-3e84e10daf7282c61b6a557a8e97af84d8ab3e15.zip |
build: finer grained rpath checking for binary/install
Diffstat (limited to 'buildtools/wafsamba/samba_utils.py')
-rw-r--r-- | buildtools/wafsamba/samba_utils.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index 564b5b82e3..8bd913f720 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -59,23 +59,26 @@ def runonce(function): return wrapper - -def set_rpath(bld): - '''setup the default rpath''' - if bld.env.RPATH_ON_BUILD: - rpath = os.path.normpath('%s/%s' % (bld.env['BUILD_DIRECTORY'], LIB_PATH)) - bld.env.append_value('RPATH', '-Wl,-rpath=%s' % rpath) - else: - os.environ['LD_LIBRARY_PATH'] = os.path.normpath('%s/../shared' % bld.srcnode.abspath(bld.env)) -Build.BuildContext.set_rpath = set_rpath - 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 [] +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] + os.environ['LD_LIBRARY_PATH'] = rpath + return [] + + ############################################################# # return a named build cache dictionary, used to store # state inside the following functions |