ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3368 from eli-schwartz/meson-execinfo-bool

Browse Source 
meson: fix broken commit that broke the build
This commit is contained in:
Yonatan Komornik
2022-12-16 09:14:53 -08:00
committed by GitHub
parent ee6475cbbd 626425dce0
commit 8745229612
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/meson/meson.build
+1 -1
View File
@@ -26,7 +26,7 @@ project('zstd',
version: run_command( version: run_command(
find_program('GetZstdLibraryVersion.py'), '../../lib/zstd.h', find_program('GetZstdLibraryVersion.py'), '../../lib/zstd.h',
check: true).stdout().strip(), check: true).stdout().strip(),
meson_version: '>=0.48.0') meson_version: '>=0.50.0')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
cxx = meson.get_compiler('cpp') cxx = meson.get_compiler('cpp')
build/meson/programs/meson.build
+2 -2
View File
@@ -51,8 +51,8 @@ endif
export_dynamic_on_windows = false export_dynamic_on_windows = false
# explicit backtrace enable/disable for Linux & Darwin # explicit backtrace enable/disable for Linux & Darwin
execinfo = cc.has_header('execinfo.h', required: use_backtrace) have_execinfo = cc.has_header('execinfo.h', required: use_backtrace)
if not execinfo.found() if not have_execinfo
zstd_c_args += '-DBACKTRACE_ENABLE=0' zstd_c_args += '-DBACKTRACE_ENABLE=0'
elif use_debug and host_machine_os == os_windows # MinGW target elif use_debug and host_machine_os == os_windows # MinGW target
zstd_c_args += '-DBACKTRACE_ENABLE=1' zstd_c_args += '-DBACKTRACE_ENABLE=1'