diff options
| author | Michael Haubenwallner <haubi@gentoo.org> | 2014-05-15 08:17:03 (GMT) |
|---|---|---|
| committer | Michael Haubenwallner <haubi@gentoo.org> | 2014-05-15 08:17:03 (GMT) |
| commit | c82684ba964183647a1965589ef852eacd9e5447 (patch) | |
| tree | eeac860a5e8bba755f8f5dc091702bc78989d8a0 /test/CXX/CXX.py | |
| parent | 80cdee0bb0319a9c14abd9c60b4123aee07f0274 (diff) | |
| download | SCons-c82684ba964183647a1965589ef852eacd9e5447.zip SCons-c82684ba964183647a1965589ef852eacd9e5447.tar.gz SCons-c82684ba964183647a1965589ef852eacd9e5447.tar.bz2 | |
Respect preset CC/CXX values detecting cc/c++/gcc/g++ Tools.
As the user-preset values for CC/CXX should rule always, also respect them in
exists() and generate() methods of these Tools. As a result, the value for
CCVERSION/CXXVERSION does match the CC/CXX compiler used (issue#1723).
Diffstat (limited to 'test/CXX/CXX.py')
| -rw-r--r-- | test/CXX/CXX.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/CXX/CXX.py b/test/CXX/CXX.py index cd354ae..79dbde4 100644 --- a/test/CXX/CXX.py +++ b/test/CXX/CXX.py @@ -186,7 +186,8 @@ env.Program(target = 'test6', source = 'test6.C') test.write("wrapper.py", """import os import sys -open('%s', 'wb').write("wrapper.py\\n") +if '--version' not in sys.argv and '-dumpversion' not in sys.argv: + open('%s', 'wb').write("wrapper.py\\n") os.system(" ".join(sys.argv[1:])) """ % test.workpath('wrapper.out').replace('\\', '\\\\')) |