fix: resolve zstd-sys compilation issues with zig cross-compilation (#203)

- Update to mlugg/setup-zig@v2 for better stability and features
- Use Zig 0.13.0 for improved musl target support
- Add system zstd libraries (libzstd-dev, zstd) to Ubuntu dependencies
- Configure environment variables for zstd-sys to use pkg-config
- Enable pkg-config feature for zstd dependency to prefer system library
- Add proper C/C++ compiler configuration for musl targets

Fixes the 'error: unable to parse target query x86_64-unknown-linux-musl: UnknownOperatingSystem'
compilation error in zstd-sys during cross-compilation.
This commit is contained in:
安正超
2025-07-14 20:01:52 +08:00
committed by GitHub
parent 63b79ae151
commit ccad91a4a9
4 changed files with 33 additions and 3 deletions

View File

@@ -58,7 +58,9 @@ runs:
libwebkit2gtk-4.1-dev \
libxdo-dev \
pkg-config \
libssl-dev
libssl-dev \
libzstd-dev \
zstd
- name: Install protoc
uses: arduino/setup-protoc@v3
@@ -81,6 +83,8 @@ runs:
- name: Install Zig
if: inputs.install-cross-tools == 'true'
uses: mlugg/setup-zig@v2
with:
version: 0.13.0
- name: Install cargo-zigbuild
if: inputs.install-cross-tools == 'true'

View File

@@ -191,6 +191,17 @@ jobs:
run: |
# Use unified build script for consistent builds
./build-rustfs.sh --platform ${{ matrix.target }}
env:
# Set environment variables for zstd-sys to avoid target parsing issues
ZSTD_SYS_USE_PKG_CONFIG: 1
PKG_CONFIG_ALLOW_CROSS: 1
# For musl targets, use system zstd if available
CC_x86_64_unknown_linux_musl: zig cc -target x86_64-linux-musl
CXX_x86_64_unknown_linux_musl: zig c++ -target x86_64-linux-musl
AR_x86_64_unknown_linux_musl: zig ar
CC_aarch64_unknown_linux_musl: zig cc -target aarch64-linux-musl
CXX_aarch64_unknown_linux_musl: zig c++ -target aarch64-linux-musl
AR_aarch64_unknown_linux_musl: zig ar
- name: Create release package
id: package

View File

@@ -265,7 +265,7 @@ wildmatch = { version = "2.4.0", features = ["serde"] }
winapi = { version = "0.3.9" }
xxhash-rust = { version = "0.8.15", features = ["xxh64", "xxh3"] }
zip = "2.4.2"
zstd = "0.13.3"
zstd = { version = "0.13.3", features = ["pkg-config"] }
anyhow = "1.0.98"
[profile.wasm-dev]

View File

@@ -173,12 +173,27 @@ setup_rust_environment() {
# For cargo-zigbuild, set up additional environment variables
if command -v cargo-zigbuild &> /dev/null; then
print_message $YELLOW "Configuring cargo-zigbuild for musl target..."
# Set environment variables for better musl support
export CC_x86_64_unknown_linux_musl="zig cc -target x86_64-linux-musl"
export CXX_x86_64_unknown_linux_musl="zig c++ -target x86_64-linux-musl"
export AR_x86_64_unknown_linux_musl="zig ar"
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER="zig cc -target x86_64-linux-musl"
export CC_aarch64_unknown_linux_musl="zig cc -target aarch64-linux-musl"
export CXX_aarch64_unknown_linux_musl="zig c++ -target aarch64-linux-musl"
export AR_x86_64_unknown_linux_musl="zig ar"
export AR_aarch64_unknown_linux_musl="zig ar"
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER="zig cc -target aarch64-linux-musl"
# Set environment variables for zstd-sys to avoid target parsing issues
export ZSTD_SYS_USE_PKG_CONFIG=1
export PKG_CONFIG_ALLOW_CROSS=1
# Use system zstd if available for musl builds
if [[ "$PLATFORM" == *"musl"* ]]; then
export ZSTD_SYS_USE_PKG_CONFIG=1
export PKG_CONFIG_ALLOW_CROSS=1
fi
fi
fi