diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/CHANGES.txt | 3 | ||||
-rw-r--r-- | src/engine/SCons/Node/__init__.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 8a16c8c..4c89805 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -24,6 +24,9 @@ RELEASE 1.X - XXX - Fix use of VariantDir when the -n option is used and doesn't, therefore, actually create the variant directory. + - Fix a stack trace from the --debug=includes option when passed a + static or shared library as an argument. + RELEASE 1.1.0 - Thu, 09 Oct 2008 08:33:47 -0700 diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index 3a92b33..871efff 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -1104,7 +1104,10 @@ class Node: env = self.get_build_env() for s in self.sources: scanner = self.get_source_scanner(s) - path = self.get_build_scanner_path(scanner) + if scanner: + path = self.get_build_scanner_path(scanner) + else: + path = None def f(node, env=env, scanner=scanner, path=path): return node.get_found_includes(env, scanner, path) return SCons.Util.render_tree(s, f, 1) |