Mesa (master): scons: Don't use -z defs ld option on Mac.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Sun Jul 21 14:39:49 UTC 2013


Module: Mesa
Branch: master
Commit: 190312949e8ce2c1dc884d4db5d6a44511666641
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=190312949e8ce2c1dc884d4db5d6a44511666641

Author: José Fonseca <jfonseca at vmware.com>
Date:   Sun Jul 21 09:55:04 2013 +0100

scons: Don't use -z defs ld option on Mac.

Should fix fdo bug 67098.

---

 src/gallium/targets/libgl-xlib/SConscript |    3 ++-
 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 952ab62..fc0264c 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 5295232..b1b854d 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(




More information about the mesa-commit mailing list