diff options
author | marha <marha@users.sourceforge.net> | 2012-08-03 08:16:19 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:35:02 +0200 |
commit | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (patch) | |
tree | a6124cc965bba51de50907418ce63ab4540f582d /mesalib/scons | |
parent | 49838240b7d4cff1ffed1bd91e495f6919061f90 (diff) | |
download | vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.gz vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.bz2 vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.zip |
pixman mesa git update 3 Aug 2012
Diffstat (limited to 'mesalib/scons')
-rw-r--r-- | mesalib/scons/gallium.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index 458651b45..f4776d83d 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -141,6 +141,7 @@ def generate(env): env['msvc'] = env['CC'] == 'cl' env['suncc'] = env['platform'] == 'sunos' and os.path.basename(env['CC']) == 'cc' env['clang'] = env['CC'] == 'clang' + env['icc'] = 'icc' == os.path.basename(env['CC']) if env['msvc'] and env['toolchain'] == 'default' and env['machine'] == 'x86_64': # MSVC x64 support is broken in earlier versions of scons @@ -154,6 +155,7 @@ def generate(env): gcc = env['gcc'] msvc = env['msvc'] suncc = env['suncc'] + icc = env['icc'] # Determine whether we are cross compiling; in particular, whether we need # to compile code generators with a different compiler as the target code. @@ -382,6 +384,10 @@ def generate(env): cflags += [ '-Wdeclaration-after-statement', ] + if icc: + cflags += [ + '-std=gnu99', + ] if msvc: # See also: # - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx |