Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meson: fix broken commit that broke the build #3368

Merged
merged 2 commits into from
Dec 16, 2022
Merged

meson: fix broken commit that broke the build #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8401e9
meson: fix broken commit that broke the build
eli-schwartz Dec 16, 2022
626425d
meson: fix warning for using too-new features
eli-schwartz Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/meson/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions build/meson/programs/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down