Squashed 'waflib/' changes from 915dcb17..e7a29b6b

e7a29b6b Upgrade to waf 2.0.15
8280f9de Add command for running executables from the build directory
8073c1ad Make make_simple_dox() safe in case of exception
70d03b82 Avoid use of global counter hacks for configuration display
b7d689a4 Rewrite test framework
94deadf0 Automatically add options and move add_flags() to options context
f4259ee4 Reduce system include path noise
927b6082 Automatically display configuration header
c44b8f3b Set line justification from a constant in the wscript
a48e26fd Automatically detect if wscript has a test hook
ef66724d Save runtime variables in the environment
63bcbcd3 Clean up TestContext
b1d95050 Add ExecutionContext for setting runtime environment
387c1dfa Add show_diff() and test_file_equals() utilities
29d4d293 Fix in-tree library paths
9fde01f4 Add custom configuration context
6d3612fd Add lib_path_name constant

git-subtree-dir: waflib
git-subtree-split: e7a29b6b9b2f842314244c23c14d8f8f560904e1

1 files changed, 17 insertions, 2 deletions

diff --git a/Tools/ccroot.py b/Tools/ccroot.py
index cfef8bf5..579d5b2b 100644
--- a/Tools/ccroot.py
+++ b/Tools/ccroot.py
@@ -111,7 +111,7 @@ def apply_incpaths(self):
 		tg = bld(features='includes', includes='.')
 
 	The folders only need to be relative to the current directory, the equivalent build directory is
-	added automatically (for headers created in the build directory). This enable using a build directory
+	added automatically (for headers created in the build directory). This enables using a build directory
 	or not (``top == out``).
 
 	This method will add a list of nodes read by :py:func:`waflib.Tools.ccroot.to_incnodes` in ``tg.env.INCPATHS``,
@@ -238,6 +238,17 @@ def rm_tgt(cls):
 	setattr(cls, 'run', wrap)
 rm_tgt(stlink_task)
 
+@feature('skip_stlib_link_deps')
+@before_method('process_use')
+def apply_skip_stlib_link_deps(self):
+	"""
+	This enables an optimization in the :py:func:wafilb.Tools.ccroot.processes_use: method that skips dependency and
+	link flag optimizations for targets that generate static libraries (via the :py:class:Tools.ccroot.stlink_task task).
+	The actual behavior is implemented in :py:func:wafilb.Tools.ccroot.processes_use: method so this feature only tells waf
+	to enable the new behavior.
+	"""
+	self.env.SKIP_STLIB_LINK_DEPS = True
+
 @feature('c', 'cxx', 'd', 'fc', 'asm')
 @after_method('process_source')
 def apply_link(self):
@@ -386,7 +397,11 @@ def process_use(self):
 		y = self.bld.get_tgen_by_name(x)
 		var = y.tmp_use_var
 		if var and link_task:
-			if var == 'LIB' or y.tmp_use_stlib or x in names:
+			if self.env.SKIP_STLIB_LINK_DEPS and isinstance(link_task, stlink_task):
+				# If the skip_stlib_link_deps feature is enabled then we should
+				# avoid adding lib deps to the stlink_task instance.
+				pass
+			elif var == 'LIB' or y.tmp_use_stlib or x in names:
 				self.env.append_value(var, [y.target[y.target.rfind(os.sep) + 1:]])
 				self.link_task.dep_nodes.extend(y.link_task.outputs)
 				tmp_path = y.link_task.outputs[0].parent.path_from(self.get_cwd())