util: use C99 declaration in the for-loop hash_table_foreach() macro

[mesa.git] / src / mesa / drivers / x11 / SConscript

diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript
index cd5cccda0d1842279cc92d073ec71dcd5a95d617..b097dcc59007ccb00f6ace082d1be1eaa6f26af5 100644 (file)
--- a/src/mesa/drivers/x11/SConscript
+++ b/src/mesa/drivers/x11/SConscript
@@ -4,8 +4,6 @@ env = env.Clone()
 
 env.Append(CPPPATH = [
     '#/src',
-    '#/src/glsl',
-    '#/src/glsl/nir',
     '#/src/mapi',
     '#/src/mesa',
     '#/src/mesa/main',
@@ -20,8 +18,11 @@ env.Prepend(LIBPATH = env['X11_LIBPATH'])
 env.Prepend(LIBS = [
     glapi,
     mesautil,
+    compiler,
     glsl,
     mesa,
+    spirv,
+    nir,
 ])
 
 sources = [
@@ -35,9 +36,13 @@ sources = [
        'xm_tri.c',
 ]
 
-# Disallow undefined symbols
 if env['platform'] != 'darwin':
-    env.Append(SHLINKFLAGS = ['-Wl,-z,defs'])
+    # Disallow undefined symbols, except with Address Sanitizer, since libasan
+    # is not linked on shared libs, as it should be LD_PRELOAD'ed instead
+    if not env['asan']:
+        env.Append(SHLINKFLAGS = [
+            '-Wl,-z,defs',
+        ])
 
 # libGL.so.1.6
 libgl_1_6 = env.SharedLibrary(