Mesa (staging/19.1): nouveau: add idep_nir_headers as dep for libnouveau

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 58e026ce52b16cb5ec94f73930a40effa5e935c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=58e026ce52b16cb5ec94f73930a40effa5e935c7

Author: Stephen Barber <smbarber at chromium.org>
Date:   Mon Sep 23 17:51:43 2019 -0700

nouveau: add idep_nir_headers as dep for libnouveau

Fixes a compilation error when building libnouveau:

In file included from ../src/gallium/drivers/nouveau/nv50/nv50_program.c:25:
../src/compiler/nir/nir.h:1115:10: fatal error: nir_intrinsics.h: No such file or directory
 #include "nir_intrinsics.h"
           ^~~~~~~~~~~~~~~~~~
           compilation terminated.

Fixes: f014ae3c7cce504afe5d ("nouveau: add support for nir")
Signed-off-by: Stephen Barber <smbarber at chromium.org>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
(cherry picked from commit 8c3ace6991a67bffd4e1f7559c098b6861ef4162)

---

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

diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 64138212b5b..5f105e1c0d0 100644
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -211,13 +211,13 @@ files_libnouveau = files(
 
 libnouveau = static_library(
   'nouveau',
-  [files_libnouveau, nir_opcodes_h],
+  files_libnouveau,
   include_directories : [
     inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_common,
   ],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
-  dependencies : [dep_libdrm, dep_libdrm_nouveau],
+  dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_nir_headers],
 )
 
 nouveau_compiler = executable(