diff options
| -rw-r--r-- | lib/mesa/src/mesa/drivers/SConscript | 3 | ||||
| -rw-r--r-- | lib/mesa/src/mesa/drivers/x11/SConscript | 11 | ||||
| -rw-r--r-- | lib/mesa/src/mesa/main/mm.c | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/lib/mesa/src/mesa/drivers/SConscript b/lib/mesa/src/mesa/drivers/SConscript index f54991033..5d654f538 100644 --- a/lib/mesa/src/mesa/drivers/SConscript +++ b/lib/mesa/src/mesa/drivers/SConscript @@ -1,11 +1,10 @@ Import('*') -SConscript('osmesa/SConscript') - if env['x11']: SConscript('x11/SConscript') if env['dri']: SConscript([ + 'dri/common/xmlpool/SConscript', 'dri/common/SConscript', ]) diff --git a/lib/mesa/src/mesa/drivers/x11/SConscript b/lib/mesa/src/mesa/drivers/x11/SConscript index b097dcc59..d29f9874f 100644 --- a/lib/mesa/src/mesa/drivers/x11/SConscript +++ b/lib/mesa/src/mesa/drivers/x11/SConscript @@ -18,11 +18,8 @@ env.Prepend(LIBPATH = env['X11_LIBPATH']) env.Prepend(LIBS = [ glapi, mesautil, - compiler, glsl, mesa, - spirv, - nir, ]) sources = [ @@ -36,13 +33,9 @@ sources = [ 'xm_tri.c', ] +# Disallow undefined symbols if env['platform'] != 'darwin': - # 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', - ]) + env.Append(SHLINKFLAGS = ['-Wl,-z,defs']) # libGL.so.1.6 libgl_1_6 = env.SharedLibrary( diff --git a/lib/mesa/src/mesa/main/mm.c b/lib/mesa/src/mesa/main/mm.c index 5f0bfe969..473e90fc2 100644 --- a/lib/mesa/src/mesa/main/mm.c +++ b/lib/mesa/src/mesa/main/mm.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <stdlib.h> +#include "compiler.h" #include "mm.h" |