summaryrefslogtreecommitdiff
path: root/scons/gallium.py
diff options
context:
space:
mode:
authorVinson Lee <vlee@vmware.com>2010-07-19 11:31:44 -0700
committerVinson Lee <vlee@vmware.com>2010-07-19 11:31:44 -0700
commit95ca22001a4d72325f963662a635d2b45feaf7b5 (patch)
tree5e5f28fd94bd804e698e5f8d739f4bb761f674e5 /scons/gallium.py
parent369e9272def1d41bec56213512c1966071f54f93 (diff)
scons: Fix Mac OS X SCons build on 32-bit CPUs.
The Mac OS X SCons build failed on 32-bit CPUs starting with commit 2f6d47a7c8d6e69e5154de44115aab9ba35a41d2 during linking of graw-null. The build succeeds though on a 64-bit CPU. See FDO bug 29117. This was the compiler error. scons: building associated VariantDir targets: build/darwin-x86-debug Linking build/darwin-x86-debug/gallium/targets/graw-null/libgraw.dylib ... Undefined symbols: "_lp_swizzled_cbuf", referenced from: _lp_swizzled_cbuf$non_lazy_ptr in libllvmpipe.a(lp_rast.os) _lp_swizzled_cbuf$non_lazy_ptr in libllvmpipe.a(lp_rast_tri.os) (maybe you meant: _lp_swizzled_cbuf$non_lazy_ptr) "_lp_dummy_tile", referenced from: _lp_dummy_tile$non_lazy_ptr in libllvmpipe.a(lp_rast.os) _lp_dummy_tile$non_lazy_ptr in libllvmpipe.a(lp_rast_tri.os) _lp_dummy_tile$non_lazy_ptr in libllvmpipe.a(lp_setup.os) (maybe you meant: _lp_dummy_tile$non_lazy_ptr) The patch adds -fno-common to all Mac OS X builds to work around this issue.
Diffstat (limited to 'scons/gallium.py')
-rw-r--r--scons/gallium.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 388f4460ab4..f03716bad8a 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -282,7 +282,7 @@ def generate(env):
ccflags += [
'-mmmx', '-msse', '-msse2', # enable SIMD intrinsics
]
- if platform == 'windows':
+ if platform in ['windows', 'darwin']:
# Workaround http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37216
ccflags += ['-fno-common']
if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2'):