diff options
author | Richard Quirk <richard.quirk@gmail.com> | 2011-12-24 10:21:03 +0100 |
---|---|---|
committer | Richard Quirk <richard.quirk@gmail.com> | 2011-12-24 10:21:03 +0100 |
commit | 6788d5265cf1914081794a37b4172b794ae7375c (patch) | |
tree | 8bf48da9de3eb29f7e5045319974594c95a506c0 | |
parent | 29948306bedca81fd85eb6f2978adbb454ca84db (diff) | |
download | scons-git-6788d5265cf1914081794a37b4172b794ae7375c.tar.gz |
Fix missing type_name declaration in error path
The symbol type_name is not declared in this scope. It looks like the
line that this change fixes was copied from elsewhere and not updated
with the correct 'symbol' variable previously.
-rw-r--r-- | src/engine/SCons/Conftest.py | 2 | ||||
-rw-r--r-- | src/engine/SCons/SConfTests.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py index 04a6bc2aa..d4662780c 100644 --- a/src/engine/SCons/Conftest.py +++ b/src/engine/SCons/Conftest.py @@ -554,7 +554,7 @@ def CheckDeclaration(context, symbol, includes = None, language = None): lang, suffix, msg = _lang2suffix(language) if msg: - context.Display("Cannot check for declaration %s: %s\n" % (type_name, msg)) + context.Display("Cannot check for declaration %s: %s\n" % (symbol, msg)) return msg src = includetext + includes diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py index b05c4cc82..e60488603 100644 --- a/src/engine/SCons/SConfTests.py +++ b/src/engine/SCons/SConfTests.py @@ -697,6 +697,8 @@ int main() { assert r, "__cplusplus not declared in C++ ??" r = sconf.CheckDeclaration('__cplusplus', language = 'C') assert not r, "__cplusplus declared in C ??" + r = sconf.CheckDeclaration('unknown', language = 'Unknown') + assert not r, "unknown language was supported ??" finally: sconf.Finish() |