summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2019-02-10 03:41:50 +0100
committerBjoern Jacke <bjacke@samba.org>2019-02-17 13:33:15 +0100
commitc9bcde012e18446e3081e190c0a0858b37fda14c (patch)
tree30f07e0714513da1bfb2cf192bdb994fb9029a6f /buildtools
parentf2c3d2b262d435e75debb00a43ed8d038f203abe (diff)
downloadsamba-c9bcde012e18446e3081e190c0a0858b37fda14c.tar.gz
waf: fix setting of RPATH_ST variable
Signed-off-by: Bjoern Jacke <bjacke@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/wscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 4ed3ae16b1a..ab19859a83f 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -315,7 +315,9 @@ def configure(conf):
break
# check which compiler/linker flags are needed for rpath support
- if not conf.CHECK_LDFLAGS(['-Wl,-rpath,.']) and conf.CHECK_LDFLAGS(['-Wl,-R,.']):
+ if conf.CHECK_LDFLAGS(['-Wl,-rpath,.']):
+ conf.env['RPATH_ST'] = '-Wl,-rpath,%s'
+ elif conf.CHECK_LDFLAGS(['-Wl,-R,.']):
conf.env['RPATH_ST'] = '-Wl,-R,%s'
# check for rpath