diff options
| author | Steven Siloti <ssiloti@gmail.com> | 2013-10-23 20:46:05 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-10-25 02:48:35 +0200 |
| commit | 319c2d731148adda260a2fba9719ca8c6dc287f5 (patch) | |
| tree | 26ebae2d3a71b5aa571469423e158187ee5b1801 | |
| parent | 64f5e24100a764ec198cab9a8d2c43fa86e7027c (diff) | |
| download | samba-319c2d731148adda260a2fba9719ca8c6dc287f5.tar.gz samba-319c2d731148adda260a2fba9719ca8c6dc287f5.tar.bz2 samba-319c2d731148adda260a2fba9719ca8c6dc287f5.zip | |
waf: parse LDFLAGS from python
The LDFLAGS returned by get_python_variables may contain additional library
search paths. These need to be parsed out and placed in LIBPATH to maintain
correct ordering of search paths in the final link flags.
Specifically, appending LDFLAGS directly to LINKFLAGS on my system was causing
/usr/lib to be the first search path specified. This lead to linking against
installed libraries rather than the versions from the current build.
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Oct 25 02:48:35 CEST 2013 on sn-devel-104
| -rw-r--r-- | buildtools/wafadmin/Tools/python.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/buildtools/wafadmin/Tools/python.py b/buildtools/wafadmin/Tools/python.py index a15e1f620f..ab1e817fc4 100644 --- a/buildtools/wafadmin/Tools/python.py +++ b/buildtools/wafadmin/Tools/python.py @@ -10,6 +10,7 @@ import TaskGen, Utils, Options from Logs import debug, warn, info from TaskGen import extension, before, after, feature from Configure import conf +from config_c import parse_flags EXT_PY = ['.py'] FRAG_2 = ''' @@ -213,7 +214,7 @@ MACOSX_DEPLOYMENT_TARGET = %r env.append_value('LINKFLAGS_PYEMBED', lib) if Options.platform != 'darwin' and python_LDFLAGS: - env.append_value('LINKFLAGS_PYEMBED', python_LDFLAGS.split()) + parse_flags(python_LDFLAGS, 'PYEMBED', env) result = False name = 'python' + env['PYTHON_VERSION'] |