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

[GitLab Mirror]

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

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

meson: use idep_nir instead of libnir in haiku softpipe

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

---

 src/gallium/targets/haiku-softpipe/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/haiku-softpipe/meson.build b/src/gallium/targets/haiku-softpipe/meson.build
index 139eb79a79d..d92f583210d 100644
--- a/src/gallium/targets/haiku-softpipe/meson.build
+++ b/src/gallium/targets/haiku-softpipe/meson.build
@@ -31,10 +31,10 @@ libswpipe = shared_library(
   link_args : [ld_args_bsymbolic, ld_args_gc_sections],
   link_with : [
     libglapi, libswhgl, libsthgl, libcompiler,
-    libmesa_gallium, libglsl, libnir, libgallium, libgl
+    libmesa_gallium, libglsl, libgallium, libgl
   ],
   dependencies : [
     driver_swrast, cpp.find_library('be'), cpp.find_library('translation'),
-    cpp.find_library('network'), dep_unwind, idep_mesautil,
+    cpp.find_library('network'), dep_unwind, idep_mesautil, idep_nir,
   ]
 )