diff options
| author | José Fonseca <[email protected]> | 2013-07-21 09:55:04 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2013-07-21 09:55:04 +0100 |
| commit | 190312949e8ce2c1dc884d4db5d6a44511666641 (patch) | |
| tree | 0c6af3946d2be698f7ffa6b706f11a70a44d892c /src | |
| parent | cd90ebefd4f63d00eb65af6069fb078e454c43f1 (diff) | |
scons: Don't use -z defs ld option on Mac.
Should fix fdo bug 67098.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/SConscript | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 952ab62fdde..fc0264c882a 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -46,7 +46,8 @@ if env['llvm']: env.Prepend(LIBS = [llvmpipe]) # Disallow undefined symbols -env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) +if env['platform'] != 'darwin': + env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) # libGL.so.1.5 libgl_1_5 = env.SharedLibrary( diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index 52952324386..b1b854d0225 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -32,7 +32,8 @@ sources = [ ] # Disallow undefined symbols -env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) +if env['platform'] != 'darwin': + env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) # libGL.so.1.6 libgl_1_6 = env.SharedLibrary( |