]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
meson: fix broken commit that broke the build
authorEli Schwartz <eschwartz@archlinux.org>
Fri, 16 Dec 2022 00:48:22 +0000 (19:48 -0500)
committerEli Schwartz <eschwartz@archlinux.org>
Fri, 16 Dec 2022 01:08:28 +0000 (20:08 -0500)
In commit 031de3c69ccbf3282ed02fb49369b476730aeca8 some code was added
that returned a boolean, but was treated as if it returned a dependency
object. This wasn't tested and could not work. Moreover, zstd no longer
built at all unless the entire programs directory was disabled and not
even evaluated.

Fix the return type checking.

build/meson/programs/meson.build

index 8cee115da751c108bd131557098fc49aa8950989..e611dc3374cbbac726f88c9c4c6bf55ac6e2f2e8 100644 (file)
@@ -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'