From 319c2d731148adda260a2fba9719ca8c6dc287f5 Mon Sep 17 00:00:00 2001 From: Steven Siloti Date: Wed, 23 Oct 2013 20:46:05 -0700 Subject: 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 Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Fri Oct 25 02:48:35 CEST 2013 on sn-devel-104 --- buildtools/wafadmin/Tools/python.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'buildtools/wafadmin') 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'] -- cgit