diff options
| author | Thomas Nagy <tnagy@waf.io> | 2015-10-31 14:38:10 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2015-11-02 00:31:14 +0100 |
| commit | 77afc1baa24df00cd8d283ab1f19c53e01e4343e (patch) | |
| tree | c6610ae6faf944f116267db76677036f08d31bdb /third_party | |
| parent | 9ef47d25317947248b0796059e6f0a851ba3cb07 (diff) | |
| download | samba-77afc1baa24df00cd8d283ab1f19c53e01e4343e.tar.gz | |
build:wafsamba: Update waf/wafadmin/Tools/config_c.py from upstream
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>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/waf/wafadmin/Tools/config_c.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/waf/wafadmin/Tools/config_c.py b/third_party/waf/wafadmin/Tools/config_c.py index 9f1103cb27d..3ab447ccf42 100644 --- 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,'): |