mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

meson: de-duplicate LLVM check 

By adding `_llvm == 'true'` to the required argument we can check the
'auto' and 'true' case in one path.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Dylan Baker 2018-09-24 09:32:56 -07:00
parent f2519e3493
commit f03a160592
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meson.build
View File

@ -1189,28 +1189,21 @@ endif
_shared_llvm = get_option('shared-llvm')
_llvm = get_option('llvm')
if _llvm == 'auto'
dep_llvm = dependency(
'llvm',
version : _llvm_version,
modules : llvm_modules,
optional_modules : llvm_optional_modules,
required : with_amd_vk or with_gallium_radeonsi or with_gallium_swr or with_gallium_opencl,
static : not _shared_llvm
)
with_llvm = dep_llvm.found()
elif _llvm == 'true'
dep_llvm = null_dep
with_llvm = false
if _llvm != 'false'
dep_llvm = dependency(
'llvm',
version : _llvm_version,
modules : llvm_modules,
optional_modules : llvm_optional_modules,
required : (
with_amd_vk or with_gallium_radeonsi or with_gallium_swr or
with_gallium_opencl or _llvm == 'true'
),
static : not _shared_llvm,
)
with_llvm = true
else
dep_llvm = null_dep
with_llvm = false
with_llvm = dep_llvm.found()
endif
if with_llvm
_llvm_version = dep_llvm.version().split('.')