From 77afc1baa24df00cd8d283ab1f19c53e01e4343e Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 31 Oct 2015 14:38:10 +0100 Subject: 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 Reviewed-by: Andrew Bartlett Reviewed-by: Michael Adam --- third_party/waf/wafadmin/Tools/config_c.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'third_party') 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,'): -- cgit v1.2.1