From 5468e0031bb41c7475e5aaf8e6cf5fb3336cc17d Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Wed, 2 Aug 2017 00:38:11 +0200 Subject: [PATCH] Typo process_uselib_vars -> propagate_uselib_vars #2005 --- playground/xcode6/wscript | 2 +- waflib/extras/xcode6.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/playground/xcode6/wscript b/playground/xcode6/wscript index 50711be8..f1423257 100644 --- a/playground/xcode6/wscript +++ b/playground/xcode6/wscript @@ -89,7 +89,7 @@ def build(bld): source=['src/test.cpp'], includes='include', target='MyExe', - use='MyDynLib' + use='MyDynLib STD11' ) # Make .dylib shared libraries diff --git a/waflib/extras/xcode6.py b/waflib/extras/xcode6.py index 0c97ea28..b1aa3797 100644 --- a/waflib/extras/xcode6.py +++ b/waflib/extras/xcode6.py @@ -470,7 +470,7 @@ class PBXProject(XCodeNode): return None @TaskGen.feature('c', 'cxx') -@TaskGen.after('process_uselib_vars', 'apply_incpaths') +@TaskGen.after('propagate_uselib_vars', 'apply_incpaths') def process_xcode(self): bld = self.bld try: @@ -562,9 +562,6 @@ def process_xcode(self): libs = Utils.to_list(self.env.STLIB) + Utils.to_list(self.env.LIB) libs = ' '.join(bld.env['STLIB_ST'] % t for t in libs) - linkflags = bld.env['LINKFLAGS'] - ldflags = bld.env['LDFLAGS'] - # Override target specific build settings bldsettings = { 'HEADER_SEARCH_PATHS': ['$(inherited)'] + self.env['INCPATHS'],