diff options
| author | Jörg Frings-Fürst <jff@merkur> | 2014-07-26 11:45:47 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <jff@merkur> | 2014-07-26 11:45:47 +0200 |
| commit | 7c6b954c00c2a2eed2e975ec797216c515cd249d (patch) | |
| tree | 475c0ae1b3b3b8be085b54420894896688ea363c /engine/SCons/Tool/c++.py | |
| parent | 2176ae74d2f856582dd1e498a63a31949a7e19e2 (diff) | |
Imported Upstream version 2.3.2upstream/2.3.2
Diffstat (limited to 'engine/SCons/Tool/c++.py')
| -rw-r--r-- | engine/SCons/Tool/c++.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/SCons/Tool/c++.py b/engine/SCons/Tool/c++.py index 7b98b76..a35bdf9 100644 --- a/engine/SCons/Tool/c++.py +++ b/engine/SCons/Tool/c++.py @@ -8,7 +8,7 @@ selection method. """ # -# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation +# Copyright (c) 2001 - 2014 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -30,7 +30,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/c++.py 2014/03/02 14:18:15 garyo" +__revision__ = "src/engine/SCons/Tool/c++.py 2014/07/05 09:42:21 garyo" import os.path @@ -72,7 +72,8 @@ def generate(env): SCons.Tool.cc.add_common_cc_variables(env) - env['CXX'] = 'c++' + if 'CXX' not in env: + env['CXX'] = env.Detect(compilers) or compilers[0] env['CXXFLAGS'] = SCons.Util.CLVar('') env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES' env['SHCXX'] = '$CXX' @@ -90,7 +91,7 @@ def generate(env): env['CXXFILESUFFIX'] = '.cc' def exists(env): - return env.Detect(compilers) + return env.Detect(env.get('CXX', compilers)) # Local Variables: # tab-width:4 |