From cd2609b12ca7b4f915b674cd04d35dbdd47b9227 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Wed, 9 Nov 2022 15:12:19 +0100
Subject: [PATCH] clc: generate sources only with with_microsoft_clc

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19617>
---
 src/compiler/clc/meson.build | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build
index a082a87..4fd4a22 100644
--- a/src/compiler/clc/meson.build
+++ b/src/compiler/clc/meson.build
@@ -21,34 +21,36 @@
 
 clang_resource_dir = join_paths(llvm_libdir, 'clang', dep_llvm.version(), 'include')
 
-if dep_llvm.version().version_compare('< 15.0')
-  opencl_c_h = custom_target(
-    'opencl-c.h',
-    input : [files_xxd, join_paths(clang_resource_dir, 'opencl-c.h')],
-    output : 'opencl-c.h.h',
-    command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'opencl_c_source'],
-  )
-endif
-
-opencl_c_base_h = custom_target(
-  'opencl-c-base.h',
-  input : [files_xxd, join_paths(clang_resource_dir, 'opencl-c-base.h')],
-  output : 'opencl-c-base.h.h',
-  command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'opencl_c_base_source'],
-)
-
-_libclc_sources = [opencl_c_base_h]
-if dep_llvm.version().version_compare('< 15.0')
-  _libclc_sources += [opencl_c_h]
-endif
-
 files_libclc = files(
   'clc.c',
   'clc_helpers.cpp',
 )
 
 _libclc_cpp_args = ['-DCLANG_RESOURCE_DIR="@0@"'.format(clang_resource_dir)]
+_libclc_sources = []
+
 if with_microsoft_clc
+  if dep_llvm.version().version_compare('< 15.0')
+    opencl_c_h = custom_target(
+      'opencl-c.h',
+      input : [files_xxd, join_paths(clang_resource_dir, 'opencl-c.h')],
+      output : 'opencl-c.h.h',
+      command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'opencl_c_source'],
+    )
+  endif
+
+  opencl_c_base_h = custom_target(
+    'opencl-c-base.h',
+    input : [files_xxd, join_paths(clang_resource_dir, 'opencl-c-base.h')],
+    output : 'opencl-c-base.h.h',
+    command : [prog_python, '@INPUT@', '@OUTPUT@', '-n', 'opencl_c_base_source'],
+  )
+
+  _libclc_sources += [opencl_c_base_h]
+  if dep_llvm.version().version_compare('< 15.0')
+    _libclc_sources += [opencl_c_h]
+  endif
+
   _libclc_cpp_args += ['-DUSE_STATIC_OPENCL_C_H=1']
 endif
 
-- 
2.7.4