diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-02 18:31:49 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-09-02 18:31:49 +0200 |
| commit | 222d2f2ac2c7d93cbc0643082c78278ad2c8cfce (patch) | |
| tree | b79152c238022b2a901201c22e5809ac520732bf /scons/gallium.py | |
| parent | 443abc80db9e1a288ce770e76cccd43664348098 (diff) | |
| parent | e73c5501b2fe20290d1b691c85a5d82ac3a0431c (diff) | |
Merge remote branch 'origin/master' into nv50-compiler
Conflicts:
src/gallium/drivers/nv50/nv50_program.c
Diffstat (limited to 'scons/gallium.py')
| -rw-r--r-- | scons/gallium.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py index 03a4ef5881..d9a5fe0eea 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 += [ |