From: Björn Jacke <bj@sernet.de>
Date: Sun, 10 Feb 2019 02:41:50 +0000 (+0100)
Subject: waf: fix setting of RPATH_ST variable
X-Git-Tag: ldb-1.6.1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9bcde012e18446e3081e190c0a0858b37fda14c;p=thirdparty%2Fsamba.git

waf: fix setting of RPATH_ST variable

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

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