diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2022-12-20 15:36:13 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-01-19 16:29:03 +0000 |
| commit | d00c6e0fd754534ff493c9a58f3092eeb27343ff (patch) | |
| tree | f09d931946069eccf316799053d820e6211eec94 /meson.build | |
| parent | c40e1bb1d04ed63256ece125b98aa00eec3c09de (diff) | |
| download | mesa-d00c6e0fd754534ff493c9a58f3092eeb27343ff.tar.gz | |
meson: use a feature option for llvm
Still not as awesome as it should be, but an improvement over what we had
before.
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20409>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 83df5ba1f48..e3fd954c983 100644 --- a/meson.build +++ b/meson.build @@ -1681,17 +1681,10 @@ else _shared_llvm = (_shared_llvm == 'enabled') endif _llvm = get_option('llvm') -if _llvm == 'true' - _llvm = 'enabled' - warning('llvm option "true" deprecated, please use "enabled" instead.') -elif _llvm == 'false' - _llvm = 'disabled' - warning('llvm option "false" deprecated, please use "disabled" instead.') -endif dep_llvm = null_dep with_llvm = false -if _llvm != 'disabled' +if _llvm.allowed() dep_llvm = dependency( 'llvm', version : _llvm_version, @@ -1699,7 +1692,7 @@ if _llvm != 'disabled' optional_modules : llvm_optional_modules, required : ( with_amd_vk or with_gallium_radeonsi or with_gallium_opencl or with_clc - or _llvm == 'enabled' + or _llvm.enabled() ), static : not _shared_llvm, fallback : ['llvm', 'dep_llvm'], |