diff options
Diffstat (limited to 'waflib/Tools/ccroot.py')
-rw-r--r-- | waflib/Tools/ccroot.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py index 8b22ad0..9d865bf 100644 --- a/waflib/Tools/ccroot.py +++ b/waflib/Tools/ccroot.py @@ -130,6 +130,10 @@ def rm_tgt(cls): return old(self) setattr(cls,'run',wrap) rm_tgt(stlink_task) +@feature('skip_stlib_link_deps') +@before_method('process_use') +def apply_skip_stlib_link_deps(self): + self.env.SKIP_STLIB_LINK_DEPS=True @feature('c','cxx','d','fc','asm') @after_method('process_source') def apply_link(self): @@ -233,7 +237,9 @@ 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): + 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()) |