summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2013-07-19 13:08:07 +0100
committerJosé Fonseca <[email protected]>2013-07-19 13:08:07 +0100
commit719000bd7d7d227a721ee24ea49a55ab9a972b56 (patch)
tree44d23fa8cd7347d786d91c596a7aa4bc27622651
parent9f07ca11c1797ac12de1e1c6aef13cf58824b5f5 (diff)
scons: Disallow undefined symbols in Xlib libGL.so.
It's not the first time that, due to missing build dependencies or incomplete commits, we end up with a broken libGL.so that's missing symbols, causing all tests to fail catastrophically. Instead try to catch this sort of issues earlier.
-rw-r--r--src/gallium/targets/libgl-xlib/SConscript3
-rw-r--r--src/mesa/drivers/x11/SConscript3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 58ed6d4a30f..952ab62fdde 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -45,6 +45,9 @@ if env['llvm']:
env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE'])
env.Prepend(LIBS = [llvmpipe])
+# Disallow undefined symbols
+env.Append(SHLINKFLAGS = ['-Wl,-z,defs'])
+
# libGL.so.1.5
libgl_1_5 = env.SharedLibrary(
target ='GL',
diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript
index b0173bee94c..52952324386 100644
--- a/src/mesa/drivers/x11/SConscript
+++ b/src/mesa/drivers/x11/SConscript
@@ -31,6 +31,9 @@ sources = [
'xm_tri.c',
]
+# Disallow undefined symbols
+env.Append(SHLINKFLAGS = ['-Wl,-z,defs'])
+
# libGL.so.1.6
libgl_1_6 = env.SharedLibrary(
target ='GL',