From e501e2f5c9b69dcedaeb89a25a1de29503b1d51f Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Fri, 23 Nov 2018 21:22:21 -0500 Subject: [PATCH] libdw support is optional This was no longer optional, leading to deadcode. This regression was found trying to fix the unwind variant in cerbero. --- meson.build | 2 +- meson_options.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 739d942171..3d09d2991a 100644 --- a/meson.build +++ b/meson.build @@ -347,7 +347,7 @@ endif backtrace_deps = [] unwind_dep = dependency('libunwind', required : get_option('libunwind')) -dw_dep = dependency('libdw', required: get_option('libunwind')) +dw_dep = dependency('libdw', required: get_option('libdw')) backtrace_deps = [unwind_dep, dw_dep] if unwind_dep.found() cdata.set('HAVE_UNWIND', 1) diff --git a/meson_options.txt b/meson_options.txt index cd5bead1fb..50445af10e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,6 +20,7 @@ option('memory-alignment', type: 'combo', # Feature options option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') option('libunwind', type : 'feature', value : 'auto', description : 'Use libunwind to generate backtraces') +option('libdw', type : 'feature', value : 'auto', description : 'Use libdw to generate better backtraces from libunwind') option('bash-completion', type : 'feature', value : 'auto', description : 'Install bash completion files') # Common feature options