diff --git a/.github/workflows/build-platform.yml b/.github/workflows/build-platform.yml index b6c02e8..3720248 100644 --- a/.github/workflows/build-platform.yml +++ b/.github/workflows/build-platform.yml @@ -82,7 +82,7 @@ jobs: run: | apk add --no-cache git clang lld llvm meson ninja cmake pkgconf curl npm nodejs \ musl-dev \ - util-linux-dev util-linux-static linux-headers libunwind-dev libunwind-static \ + util-linux-dev util-linux-static linux-headers libunwind-dev libunwind-static xz-static \ py3-tomli tar xz zstd jq bash git config --global --add safe.directory "$GITHUB_WORKSPACE" diff --git a/BUILDING.md b/BUILDING.md index ed20ae4..d24898d 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -138,7 +138,7 @@ Installation via package manager: ```sh apk add clang lld llvm meson ninja cmake pkgconf nodejs npm \ musl-dev \ - util-linux-dev util-linux-static linux-headers libunwind-dev libunwind-static + util-linux-dev util-linux-static linux-headers libunwind-dev libunwind-static xz-static ``` You will also need Rust and Zig installed. The recommended approach: diff --git a/meson/deps/meson.build b/meson/deps/meson.build index 6e80960..2a77d65 100644 --- a/meson/deps/meson.build +++ b/meson/deps/meson.build @@ -52,7 +52,7 @@ else endif crash_deps = [] -if host_machine.system() == 'linux' +if host_machine.system() == 'linux' and not cc.has_header('execinfo.h') libunwind_dep = dependency('libunwind', required: false, static: is_static) if libunwind_dep.found() and cc.has_header('libunwind.h', dependencies: libunwind_dep) crash_deps += [libunwind_dep]