diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-11-05 02:30:01 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-11-05 02:06:06 +0000 |
| commit | c9756cac057444ff7c3a77b9260fa30c35267529 (patch) | |
| tree | 7d7a4fb5846719354d77dcee46db9b7dc4b073f6 /buildtools/wafsamba/samba_utils.py | |
| parent | 21233bba9663f684cfa1ad129baa988cb52dea4d (diff) | |
| download | samba-c9756cac057444ff7c3a77b9260fa30c35267529.tar.gz samba-c9756cac057444ff7c3a77b9260fa30c35267529.tar.bz2 samba-c9756cac057444ff7c3a77b9260fa30c35267529.zip | |
waf: Put private libraries in a separate directory when building.
Thanks to Tridge for pointing out what exactly I had to change. :-)
Diffstat (limited to 'buildtools/wafsamba/samba_utils.py')
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index b9c8eca1bb..7006381ae6 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -76,11 +76,12 @@ def install_rpath(bld): def build_rpath(bld): '''the rpath value for build''' - rpath = os.path.normpath('%s/%s' % (bld.env.BUILD_DIRECTORY, LIB_PATH)) + rpaths = [os.path.normpath('%s/%s' % (bld.env.BUILD_DIRECTORY, d)) for d in ("shared", "shared/private")] bld.env['RPATH'] = [] if bld.env.RPATH_ON_BUILD: - return [rpath] - ADD_LD_LIBRARY_PATH(rpath) + return rpaths + for rpath in rpaths: + ADD_LD_LIBRARY_PATH(rpath) return [] |