openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-11-27 01:20:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: Make shared-llvm into a tri-state boolean

Browse Source 
Choosing LLVM's link mode is legitimate on UNIX systems, but only static
actually really works under Windows.

Give shared-llvm a default 'auto' mode which will pick the previous
default of true (shared) on UNIX systems, but newly defaulting to false
(static) on Windows.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Suggested-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4555>
This commit is contained in:
Daniel Stone 2020-04-14 17:41:00 +01:00 committed by Marge Bot
parent 0c05d46237
commit 9ecd9463de
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meson.build
View File

@ -1401,6 +1401,11 @@ else
endif
_shared_llvm = get_option('shared-llvm')
if _shared_llvm == 'auto'
_shared_llvm = (host_machine.system() != 'windows')
else
_shared_llvm = (_shared_llvm == 'true')
endif
_llvm = get_option('llvm')
# The cmake method will never find libllvm.so|dylib; this is fine for windows

7
meson_options.txt
View File

@ -250,9 +250,10 @@ option(
)
option(
'shared-llvm',
type : 'boolean',
value : true,
description : 'Whether to link llvm shared or statically.'
type : 'combo',
value : 'auto',
choices : ['auto', 'true', 'false'],
description : 'Whether to link LLVM shared or statically.'
)
option(
'valgrind',