libdw support is optional

This was no longer optional, leading to deadcode. This regression was
found trying to fix the unwind variant in cerbero.
This commit is contained in:
Nicolas Dufresne 2018-11-23 21:22:21 -05:00
parent 5dba53a6f9
commit e501e2f5c9
2 changed files with 2 additions and 1 deletions

View file

@ -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)

View file

@ -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