diff options
| author | Steven Knight <knight@baldmt.com> | 2002-09-05 00:04:32 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-09-05 00:04:32 (GMT) |
| commit | 246819663b8eaeb130580f4b97990248f26eaadd (patch) | |
| tree | f9ca305b654b4d35be2ba9a59bc85f341b916ac4 /src/engine/SCons/Tool/g++.py | |
| parent | 08ecd797ee635637097196960ea6a90e8dd29d62 (diff) | |
| download | SCons-246819663b8eaeb130580f4b97990248f26eaadd.zip SCons-246819663b8eaeb130580f4b97990248f26eaadd.tar.gz SCons-246819663b8eaeb130580f4b97990248f26eaadd.tar.bz2 | |
Fix the tests that broke from the tool auto-detect stuff. (Anthony Roach and SK)
Diffstat (limited to 'src/engine/SCons/Tool/g++.py')
| -rw-r--r-- | src/engine/SCons/Tool/g++.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/engine/SCons/Tool/g++.py b/src/engine/SCons/Tool/g++.py index 3c6dd36..9dba2c2 100644 --- a/src/engine/SCons/Tool/g++.py +++ b/src/engine/SCons/Tool/g++.py @@ -41,12 +41,6 @@ import SCons.Util compilers = ['c++', 'g++'] -for i in compilers: - if SCons.Util.WhereIs(i): - cxx = i - break - cxx = None - CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++'] if os.path.normcase('.c') != os.path.normcase('.C'): CXXSuffixes.append('.C') @@ -59,7 +53,7 @@ def generate(env, platform): static_obj.add_action(suffix, SCons.Defaults.CXXAction) shared_obj.add_action(suffix, SCons.Defaults.ShCXXAction) - env['CXX'] = cxx + env['CXX'] = SCons.Util.Detect(compilers, env) or 'c++' env['CXXFLAGS'] = '$CCFLAGS' env['CXXCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPINCFLAGS -c -o $TARGET $SOURCES' env['SHCXX'] = '$CXX' @@ -70,5 +64,5 @@ def generate(env, platform): env['CXXFILESUFFIX'] = '.cc' -def exists(): - return cxx +def exists(env): + return SCons.Util.Detect(compilers, env) |