diff options
| author | Karol Herbst <kherbst@redhat.com> | 2024-01-02 22:58:39 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-01-31 12:23:49 +0000 |
| commit | 37a13463478703e42e590b8d23a221604653b384 (patch) | |
| tree | 8f19daf211236cfaa40202fc74a03978b8f8fa6c | |
| parent | 501f78fdbae91c889c1c472265ab930c3e36b9bd (diff) | |
| download | mesa3d-37a13463478703e42e590b8d23a221604653b384.tar.gz | |
meson: remove opencl-external-clang-headers option and rely on shared-llvm
Setting opencl-external-clang-headers to enabled while using shared LLVM
was broken and this option was mostly used for windows to force static
inclusion of opencl base headers.
Simply relying on the shared-llvm option here is enough to get what we
want.
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/25568>
| -rw-r--r-- | .gitlab-ci/windows/mesa_build.ps1 | 1 | ||||
| -rw-r--r-- | meson_options.txt | 7 | ||||
| -rw-r--r-- | src/compiler/clc/meson.build | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 index bfdda384cc0..9b768e62818 100644 --- a/.gitlab-ci/windows/mesa_build.ps1 +++ b/.gitlab-ci/windows/mesa_build.ps1 @@ -59,7 +59,6 @@ meson setup ` -Dopencl-spirv=true ` -Dmicrosoft-clc=enabled ` -Dstatic-libclc=all ` --Dopencl-external-clang-headers=disabled ` -Dspirv-to-dxil=true ` -Dbuild-tests=true ` -Dwerror=true ` diff --git a/meson_options.txt b/meson_options.txt index e5dacd54fd9..c95b65415a9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -201,13 +201,6 @@ option( ) option( - 'opencl-external-clang-headers', - type : 'feature', - description : 'Use system Clang headers at runtime for OpenCL kernel ' + - 'compilation.', -) - -option( 'd3d-drivers-path', type : 'string', value : '', diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build index ce895e7965e..0d49495bb26 100644 --- a/src/compiler/clc/meson.build +++ b/src/compiler/clc/meson.build @@ -30,9 +30,7 @@ _libmesaclc_c_args = [] _libmesaclc_cpp_args = ['-DLLVM_LIB_DIR="@0@"'.format(llvm_libdir)] _libmesaclc_sources = [] -if get_option('opencl-external-clang-headers') \ - .disable_auto_if(host_machine.system() == 'windows') \ - .disabled() +if not _shared_llvm # LLVM 16 moved clang header path from using full version to only major version if dep_llvm.version().version_compare('< 16') # Prior to LLVM 16, this path used a full version |