From 9e5a5a11ed93637fe28735e3dd161e59c4c3e5d0 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 23 Oct 2017 20:54:03 +0200 Subject: [PATCH] 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 Reviewed-by: Dylan Baker --- meson.build | 3 ++- meson_options.txt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8db4699ec5c0f..4d4f164087439 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 1b90f5ced889f..b44c93df0015f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -142,6 +142,12 @@ option( value : true, 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',