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/wafsamba.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/wafsamba.py')
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 8a37edfb88..90006e46cf 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -121,7 +121,8 @@ def SAMBA_LIBRARY(bld, libname, source, samba_includes = includes, local_include = local_include, vnum = vnum, - install_path = None + install_path = None, + ldflags = build_rpath(bld) ) if install_path is None: @@ -151,8 +152,8 @@ def SAMBA_LIBRARY(bld, libname, source, vnum = vnum, install_as = libname, install_path = None, + ldflags = install_rpath(bld) ) - t.env['RPATH'] = install_rpath(bld) if install: if vnum: @@ -235,7 +236,8 @@ def SAMBA_BINARY(bld, binname, source, samba_modules = modules, top = True, samba_subsystem= subsystem_name, - install_path = None + install_path = None, + ldflags = build_rpath(bld) ) if install_path is None: @@ -264,9 +266,9 @@ def SAMBA_BINARY(bld, binname, source, samba_modules = modules, top = True, samba_subsystem= subsystem_name, - install_path = None + install_path = None, + ldflags = install_rpath(bld) ) - t.env['RPATH'] = install_rpath(bld) if install: bld.install_as(os.path.join(install_path, binname), |