From 963c3b62c9aeaa23b2f36ef7250adbdb42265759 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sun, 25 Oct 2015 09:00:51 +0100 Subject: [PATCH] docs: apply_incpaths_emscripten will be removed in waf 1.9 --- waflib/extras/c_emscripten.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/waflib/extras/c_emscripten.py b/waflib/extras/c_emscripten.py index ecba2f8f..7fde57ec 100644 --- a/waflib/extras/c_emscripten.py +++ b/waflib/extras/c_emscripten.py @@ -88,8 +88,9 @@ def apply_incpaths_emscripten(self): """ Emscripten doesn't like absolute include paths """ - if self.env.CC_NAME != 'emscripten' or self.env.CC_NAME != CXX_NAME: - return + # TODO: in waf 1.9 we can switch back to bldnode as the default since path_from handles cross-drive paths + if self.env.CC_NAME != 'emscripten' or self.env.CC_NAME != 'emscripten': + return lst = self.to_incnodes(self.to_list(getattr(self, 'includes', [])) + self.env['INCLUDES']) self.includes_nodes = lst self.env['INCPATHS'] = [x.path_from(self.bld.bldnode) for x in lst]