summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-08-17 00:20:58 -0700
committerVinson Lee <[email protected]>2010-08-17 00:20:58 -0700
commit462e8a8b0d0836c2c2e3b4bf137ecd17db7292d2 (patch)
tree392c3dbcc1a513dcf0fdd70871682e9f64fe4bbe
parent6043ee6e62800f4f7d2c62756b4c91cbf2639061 (diff)
scons: Add -fno-common for 64-bit builds on Mac OS X.
This option is also needed for 64-bit builds if llvm is enabled. Other the build fails during linking.
-rw-r--r--scons/gallium.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 03a4ef58815..d9a5fe0eeaf 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -291,6 +291,8 @@ def generate(env):
]
if env['machine'] == 'x86_64':
ccflags += ['-m64']
+ if platform == 'darwin':
+ ccflags += ['-fno-common']
# See also:
# - http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
ccflags += [