aboutsummaryrefslogtreecommitdiffstats
path: root/meson_options.txt
diff options
context:
space:
mode:
authorDaniel Stone <[email protected]>2020-04-14 17:41:00 +0100
committerMarge Bot <[email protected]>2020-04-16 12:18:36 +0000
commit9ecd9463de6ba7a9f0648da16ef9371dd8a202f0 (patch)
tree620a14fa467cfcdce8ea38cbd870ce47b5fd2673 /meson_options.txt
parent0c05d46237db3095ef92d61452d886286806a827 (diff)
meson: Make shared-llvm into a tri-state boolean
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 <[email protected]> Suggested-by: Dylan Baker <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Reviewed-by: Jose Fonseca <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4555>
Diffstat (limited to 'meson_options.txt')
-rw-r--r--meson_options.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/meson_options.txt b/meson_options.txt
index a39596a6f19..a342354acfc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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',