Merge pull request #3368 from eli-schwartz/meson-execinfo-bool
meson: fix broken commit that broke the build
This commit is contained in:
@@ -26,7 +26,7 @@ project('zstd',
|
||||
version: run_command(
|
||||
find_program('GetZstdLibraryVersion.py'), '../../lib/zstd.h',
|
||||
check: true).stdout().strip(),
|
||||
meson_version: '>=0.48.0')
|
||||
meson_version: '>=0.50.0')
|
||||
|
||||
cc = meson.get_compiler('c')
|
||||
cxx = meson.get_compiler('cpp')
|
||||
|
||||
@@ -51,8 +51,8 @@ endif
|
||||
|
||||
export_dynamic_on_windows = false
|
||||
# explicit backtrace enable/disable for Linux & Darwin
|
||||
execinfo = cc.has_header('execinfo.h', required: use_backtrace)
|
||||
if not execinfo.found()
|
||||
have_execinfo = cc.has_header('execinfo.h', required: use_backtrace)
|
||||
if not have_execinfo
|
||||
zstd_c_args += '-DBACKTRACE_ENABLE=0'
|
||||
elif use_debug and host_machine_os == os_windows # MinGW target
|
||||
zstd_c_args += '-DBACKTRACE_ENABLE=1'
|
||||
|
||||
Reference in New Issue
Block a user