Mesa (master): meson: use idep_nir instead of libnir in libnouveau

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a0a8b240787bd6b7a193e576f13ae1c0182de61f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a0a8b240787bd6b7a193e576f13ae1c0182de61f

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Wed Sep 25 00:35:07 2019 +0100

meson: use idep_nir instead of libnir in libnouveau

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 src/gallium/drivers/nouveau/meson.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 2e65a81f024..e48b61b8955 100644
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -223,13 +223,14 @@ nouveau_compiler = executable(
   'nouveau_compiler',
   'nouveau_compiler.c',
   include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
-  dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil],
-  link_with : [libnouveau, libgallium, libnir],
+  dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil, idep_nir],
+  link_with : [libnouveau, libgallium],
   build_by_default : with_tools.contains('nouveau'),
   install : with_tools.contains('nouveau'),
 )
 
 driver_nouveau = declare_dependency(
   compile_args : '-DGALLIUM_NOUVEAU',
-  link_with : [libnouveauwinsys, libnouveau, libnir],
+  dependencies : idep_nir,
+  link_with : [libnouveauwinsys, libnouveau],
 )