diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2022-12-21 09:26:25 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-01-19 16:29:03 +0000 |
| commit | 37463bedec59e57763ea1553724a9a264e4270e4 (patch) | |
| tree | 17b632c9fc4ea2d652c3c46345f0c5b2b6ba4fcf /meson.build | |
| parent | c52c2ed0f8f8bb87feb6dd173da16646cfaef7b7 (diff) | |
| download | mesa-37463bedec59e57763ea1553724a9a264e4270e4.tar.gz | |
meson: use a feature option for shared-llvm
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 | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/meson.build b/meson.build index 83a58e4c99c..d99b3aa4ea2 100644 --- a/meson.build +++ b/meson.build @@ -1617,21 +1617,11 @@ else _llvm_version = '>= 5.0.0' endif -_shared_llvm = get_option('shared-llvm') -if _shared_llvm == 'true' - _shared_llvm = 'enabled' - warning('shared_llvm option "true" deprecated, please use "enabled" instead.') -elif _shared_llvm == 'false' - _shared_llvm = 'disabled' - warning('shared_llvm option "false" deprecated, please use "disabled" instead.') -endif -if _shared_llvm == 'auto' - _shared_llvm = (host_machine.system() != 'windows') -else - _shared_llvm = (_shared_llvm == 'enabled') -endif -_llvm = get_option('llvm') +_shared_llvm = get_option('shared-llvm') \ + .disable_auto_if(host_machine.system() == 'windows') \ + .allowed() +_llvm = get_option('llvm') dep_llvm = null_dep with_llvm = false if _llvm.allowed() |