X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fcompiler%2Fmeson.build;h=0f8f3c12966d628c0a49103529e8f21ad446ef83;hb=5d7bcac4e711bc278eabf198d7d5016b77d9eb0e;hp=d86bdde61d8f2a2d37fb9a817d4b769d01e90a15;hpb=2083a14179eb04d22feebc5751a1a145828d07cf;p=mesa.git

diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index d86bdde61d8..0f8f3c12966 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -21,6 +21,7 @@
 inc_compiler = include_directories('.')
 inc_nir = include_directories('nir')
 inc_glsl = include_directories('glsl')
+inc_spirv = include_directories('spirv')
 
 files_libcompiler = files(
   'blob.c',
@@ -39,7 +40,7 @@ ir_expression_operation_h = custom_target(
   'ir_expression_operation.h',
   input : 'glsl/ir_expression_operation.py',
   output : 'ir_expression_operation.h',
-  command : [prog_python2, '@INPUT@', 'enum'],
+  command : [prog_python, '@INPUT@', 'enum'],
   capture : true,
 )
 
@@ -53,16 +54,21 @@ libcompiler = static_library(
   build_by_default : false,
 )
 
+subdir('spirv')
+
 subdir('nir')
 
+# This is here because putting it in spirv/meson.build would create a circular
+# dependency with nir/meson.build.
 spirv2nir = executable(
   'spirv2nir',
-  [files('spirv/spirv2nir.c'), dummy_cpp],
+  files('spirv/spirv2nir.c'),
   dependencies : [dep_m, dep_thread, idep_nir],
   include_directories : [inc_common, inc_nir, include_directories('spirv')],
   link_with : libmesa_util,
   c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
-  build_by_default : false,
+  build_by_default : with_tools.contains('nir'),
+  install : with_tools.contains('nir'),
 )
 
 subdir('glsl')