summaryrefslogtreecommitdiff
path: root/scons
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-02-04 19:37:30 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-02-04 19:37:30 +0000
commit9f151f93e69e988508d480beb36adb7674434ea7 (patch)
treeee9da2211554378ff3ddcfdc21a5f9571a52bf6d /scons
parent838d9884be626045b0306fb265d04e47cb38ae8d (diff)
scons: Only override scons CC selection in the embedded platform.
Diffstat (limited to 'scons')
-rw-r--r--scons/gallium.py28
1 files changed, 16 insertions, 12 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index a9a8b836401..7f42c766ff2 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -110,8 +110,21 @@ def generate(env):
env['toolchain'] = 'wcesdk'
env.Tool(env['toolchain'])
- if os.environ.has_key('CC'):
- env['CC'] = os.environ['CC']
+ if env['platform'] == 'embedded':
+ # Allow overriding compiler from environment
+ if os.environ.has_key('CC'):
+ env['CC'] = os.environ['CC']
+ # Update CCVERSION to match
+ pipe = SCons.Action._subproc(env, [env['CC'], '--version'],
+ stdin = 'devnull',
+ stderr = 'devnull',
+ stdout = subprocess.PIPE)
+ if pipe.wait() == 0:
+ line = pipe.stdout.readline()
+ match = re.search(r'[0-9]+(\.[0-9]+)+', line)
+ if match:
+ env['CCVERSION'] = match.group(0)
+
env['gcc'] = 'gcc' in os.path.basename(env['CC']).split('-')
env['msvc'] = env['CC'] == 'cl'
@@ -238,16 +251,7 @@ def generate(env):
cxxflags = [] # C++
ccflags = [] # C & C++
if gcc:
- ccversion = ''
- pipe = SCons.Action._subproc(env, [env['CC'], '--version'],
- stdin = 'devnull',
- stderr = 'devnull',
- stdout = subprocess.PIPE)
- if pipe.wait() == 0:
- line = pipe.stdout.readline()
- match = re.search(r'[0-9]+(\.[0-9]+)+', line)
- if match:
- ccversion = match.group(0)
+ ccversion = env['CCVERSION']
if debug:
ccflags += ['-O0', '-g3']
elif ccversion.startswith('4.2.'):