scons: gallium: link against nir as needed

... otherwise we'll produce uncomplete binaries with introduction of NIR
as alternative IR with next commits.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Acked-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript
index bf3baa7094b978dcabdb15be217421ba38f0dc0c..d7a8cbdca5d7545dc324a0dbd325f8344c69f8ac 100644 (file)
--- a/src/gallium/targets/dri/SConscript
+++ b/src/gallium/targets/dri/SConscript
@@ -44,6 +44,7 @@ env.Prepend(LIBS = [
     compiler,
     mesa,
     glsl,
+    nir,
     gallium,
     megadrivers_stub,
     dri_common,

diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
index b7c13731d68a915f4675de16e707e760e4afe648..f80c167d83bb2ac70b61f06e2c2bc9dd57d08dde 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -9,6 +9,7 @@ env.Prepend(LIBS = [
     compiler,
     mesa,
     glsl,
+    nir,
     gallium
 ])
 

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 3a63e3e6a3e4f45b0057b48b5431e390b90cc3e2..53284e57edb1fa16f78d265dcb52737d3854c36b 100644 (file)
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -50,7 +50,7 @@ if env['gles']:
 opengl32 = env.SharedLibrary(
     target ='opengl32',
     source = sources,
-    LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + env['LIBS'],
+    LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + nir + env['LIBS'],
 )
 
 env.Alias('opengl32', opengl32)

diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 1c816ff7762c286ae3bf1a21f12b71e596ca19cd..0a4f31be86dc1e2516f99df86a10e2ffabab3129 100644 (file)
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -32,6 +32,7 @@ env.Prepend(LIBS = [
     compiler,
     mesa,
     glsl,
+    nir,
     gallium,
 ])
 

diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript
index eeaacbcaf6450882f4fa15ec5e3d6933b1deeb30..7a2a00c85fe210c309bedb5f135ec6ed8d5d8c62 100644 (file)
--- a/src/gallium/targets/osmesa/SConscript
+++ b/src/gallium/targets/osmesa/SConscript
@@ -17,6 +17,7 @@ env.Prepend(LIBS = [
     gallium,
     trace,
     glsl,
+    nir,
     mesautil,
     softpipe
 ])