git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ef47d2
)
build:wafsamba: Update waf/wafadmin/Tools/config_c.py from upstream
author
Thomas Nagy
<tnagy@waf.io>
Sat, 31 Oct 2015 13:38:10 +0000
(14:38 +0100)
committer
Andrew Bartlett
<abartlet@samba.org>
Sun, 1 Nov 2015 23:31:14 +0000
(
00:31
+0100)
The upstream version features the flags processing fixes present in Waf 1.8.
Signed-off-by: Thomas Nagy <tnagy@waf.io>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
third_party/waf/wafadmin/Tools/config_c.py
patch
|
blob
|
history
diff --git
a/third_party/waf/wafadmin/Tools/config_c.py
b/third_party/waf/wafadmin/Tools/config_c.py
index 9f1103cb27d58e8b0cd3cf6aca345bbec990b6e8..3ab447ccf424c17b684f8862973deb505caa6f32 100644
(file)
--- a/
third_party/waf/wafadmin/Tools/config_c.py
+++ b/
third_party/waf/wafadmin/Tools/config_c.py
@@
-82,6
+82,10
@@
def parse_flags(line, uselib, env):
# RPATH later, and hence can potentially lead to linking
# in too old versions of our internal libs.
#
+ elif x == '-Wl,-rpath' or x == '-Wl,-R':
+ app('RPATH_' + uselib, lst.pop(0).lstrip('-Wl,'))
+ elif x.startswith('-Wl,-R,'):
+ app('RPATH_' + uselib, x[7:])
elif x.startswith('-Wl,-R'):
app('RPATH_' + uselib, x[6:])
elif x.startswith('-Wl,-rpath,'):