summaryrefslogtreecommitdiffstats
path: root/scons
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2015-03-04 13:56:35 +0000
committerJose Fonseca <jfonseca@vmware.com>2015-03-04 15:12:22 +0000
commit6e836d2c8643dff127c0aef22dcabed763d7ea3e (patch)
treeb0defc05759299d88c96cade34430f45da954e3a /scons
parentd0b1c74b73ddc7590e81bdfd837f540d75b172ce (diff)
downloadexternal_mesa3d-6e836d2c8643dff127c0aef22dcabed763d7ea3e.zip
external_mesa3d-6e836d2c8643dff127c0aef22dcabed763d7ea3e.tar.gz
external_mesa3d-6e836d2c8643dff127c0aef22dcabed763d7ea3e.tar.bz2
scons: Update for the fact that we require GCC 4.2
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'scons')
-rwxr-xr-xscons/gallium.py25
1 files changed, 10 insertions, 15 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index f839758..7533f06 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -369,20 +369,16 @@ def generate(env):
'HAVE___BUILTIN_FFS',
'HAVE___BUILTIN_FFSLL',
'HAVE_FUNC_ATTRIBUTE_FLATTEN',
+ # GCC 3.0
+ 'HAVE_FUNC_ATTRIBUTE_FORMAT',
+ 'HAVE_FUNC_ATTRIBUTE_PACKED',
+ # GCC 3.4
+ 'HAVE___BUILTIN_CTZ',
+ 'HAVE___BUILTIN_POPCOUNT',
+ 'HAVE___BUILTIN_POPCOUNTLL',
+ 'HAVE___BUILTIN_CLZ',
+ 'HAVE___BUILTIN_CLZLL',
]
- if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('3'):
- cppdefines += [
- 'HAVE_FUNC_ATTRIBUTE_FORMAT',
- 'HAVE_FUNC_ATTRIBUTE_PACKED',
- ]
- if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('3.4'):
- cppdefines += [
- 'HAVE___BUILTIN_CTZ',
- 'HAVE___BUILTIN_POPCOUNT',
- 'HAVE___BUILTIN_POPCOUNTLL',
- 'HAVE___BUILTIN_CLZ',
- 'HAVE___BUILTIN_CLZLL',
- ]
if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.5'):
cppdefines += ['HAVE___BUILTIN_UNREACHABLE']
env.Append(CPPDEFINES = cppdefines)
@@ -420,8 +416,7 @@ def generate(env):
'-m32',
#'-march=pentium4',
]
- if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \
- and platform != 'haiku':
+ if platform != 'haiku':
# NOTE: We need to ensure stack is realigned given that we
# produce shared objects, and have no control over the stack
# alignment policy of the application. Therefore we need