scons: Fix xlib build.

After glsl rework merge.

diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index dfe550f733bbc187afbd7350629028e8c6735786..7a9e985cb58b5f10eb40a64aafdf766ed9e6702c 100644 (file)
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -51,7 +51,7 @@ if env['platform'] == 'linux' \
     libgl = env.SharedLibrary(
         target ='GL',
         source = sources,
-        LIBS = st_xlib + glapi + mesa + drivers + auxiliaries + env['LIBS'],
+        LIBS = st_xlib + glapi + mesa + glsl + drivers + auxiliaries + env['LIBS'],
     )
 
     env.InstallSharedLibrary(libgl, version=(1, 5))

diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 101487df9102ee1d073b5c7c877688a45be9f5cf..8e18626c4049d2b4ced0a0b31b2f7ef0a1cb9360 100644 (file)
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -23,7 +23,7 @@ sources = [
     'cl/sl_cl_parse.c',
 ]
 
-glsl = env.StaticLibrary(
+glsl = env.ConvenienceLibrary(
     target = 'glsl',
     source = sources,
 )