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

meson: fix broken commit that broke the build
facebook · Dec 16, 2022 · 8745229 · 8745229
2 parents ee6475c + 626425d
commit 8745229
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/meson/meson.build b/build/meson/meson.build
@@ -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')

diff --git a/build/meson/programs/meson.build b/build/meson/programs/meson.build
@@ -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'