diff options
| author | Erik Faye-Lund <[email protected]> | 2017-10-23 20:54:03 +0200 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2017-10-25 14:05:24 +0200 |
| commit | 9e5a5a11ed93637fe28735e3dd161e59c4c3e5d0 (patch) | |
| tree | 9c52d8b6ab8ca3deaf468d227a8f376ee28e012c | |
| parent | d37bcf3cc2bfea79a7130ab123e94f6b881a5b7e (diff) | |
meson: add opt-out of libunwind
Libunwind has some issues on some platforms, so let's allow people
who have issues to opt-out. This is similar to what we do in automake,
and the implementation is modelled after our opt-out for valgrind.
Signed-off-by: Erik Faye-Lund <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
| -rw-r--r-- | meson.build | 3 | ||||
| -rw-r--r-- | meson_options.txt | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 8db4699ec5c..4d4f1640874 100644 --- a/meson.build +++ b/meson.build @@ -37,6 +37,7 @@ pre_args = [ with_vulkan_icd_dir = get_option('vulkan-icd-dir') with_tests = get_option('build-tests') with_valgrind = get_option('valgrind') +with_libunwind = get_option('libunwind') with_asm = get_option('asm') with_llvm = get_option('llvm') if get_option('texture-float') @@ -687,7 +688,7 @@ dep_selinux = [] # TODO: llvm-prefix and llvm-shared-libs dep_unwind = dependency('libunwind', required : false) -if dep_unwind.found() +if dep_unwind.found() and with_libunwind pre_args += '-DHAVE_LIBUNWIND' endif diff --git a/meson_options.txt b/meson_options.txt index 1b90f5ced88..b44c93df001 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -143,6 +143,12 @@ option( description : 'Build with valgrind support if possible' ) option( + 'libunwind', + type : 'boolean', + value : true, + description : 'Use libunwind for stack-traces if possible' +) +option( 'build-tests', type : 'boolean', value : false, |