summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/cc.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <jff@merkur>2014-07-26 11:45:47 +0200
committerJörg Frings-Fürst <jff@merkur>2014-07-26 11:45:47 +0200
commit7c6b954c00c2a2eed2e975ec797216c515cd249d (patch)
tree475c0ae1b3b3b8be085b54420894896688ea363c /engine/SCons/Tool/cc.py
parent2176ae74d2f856582dd1e498a63a31949a7e19e2 (diff)
Imported Upstream version 2.3.2upstream/2.3.2
Diffstat (limited to 'engine/SCons/Tool/cc.py')
-rw-r--r--engine/SCons/Tool/cc.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/engine/SCons/Tool/cc.py b/engine/SCons/Tool/cc.py
index 0702138..5b5ab05 100644
--- a/engine/SCons/Tool/cc.py
+++ b/engine/SCons/Tool/cc.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/cc.py 2014/03/02 14:18:15 garyo"
+__revision__ = "src/engine/SCons/Tool/cc.py 2014/07/05 09:42:21 garyo"
import SCons.Tool
import SCons.Defaults
@@ -62,6 +62,8 @@ def add_common_cc_variables(env):
if 'SHCCFLAGS' not in env:
env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
+compilers = ['cc']
+
def generate(env):
"""
Add Builders and construction variables for C compilers to an Environment.
@@ -76,7 +78,8 @@ def generate(env):
add_common_cc_variables(env)
- env['CC'] = 'cc'
+ if 'CC' not in env:
+ env['CC'] = env.Detect(compilers) or compilers[0]
env['CFLAGS'] = SCons.Util.CLVar('')
env['CCCOM'] = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
env['SHCC'] = '$CC'
@@ -93,7 +96,7 @@ def generate(env):
env['CFILESUFFIX'] = '.c'
def exists(env):
- return env.Detect('cc')
+ return env.Detect(env.get('CC', compilers))
# Local Variables:
# tab-width:4