FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More accurate rpath parsing in parse_flags

This commit is contained in:
Thomas Nagy 2015-04-08 23:32:53 +02:00
parent d46bc99b22
commit 0c0e0388a0
No known key found for this signature in database
GPG Key ID: 67A565EDFDF90E64
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
waflib/Tools/c_config.py
View File

@ -7,7 +7,7 @@ C/C++/D configuration helpers
"""
import os, re, shlex, sys
from waflib import Build, Utils, Task, Options, Logs, Errors, ConfigSet, Runner
from waflib import Build, Utils, Task, Options, Logs, Errors, Runner
from waflib.TaskGen import after_method, feature
from waflib.Configure import conf
@ -175,8 +175,10 @@ def parse_flags(self, line, uselib_store, env=None, force_static=False, posix=No
appu('FRAMEWORK_' + uselib, [lst.pop(0)])
elif x.startswith('-F'):
appu('FRAMEWORKPATH_' + uselib, [x[2:]])
elif x == '-Wl,-rpath':
app('RPATH_' + uselib, lst.pop(0))
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,'):