actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-05-03 10:40:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use cargo-zigbuild for cross compilation ()

Browse source 
* Disable link arg `-lgcc` for musl builds when `cargo-zigbuild` is used

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-02-15 09:19:59 +11:00 • committed by GitHub
parent 3fffe39635
commit 647f02bb59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions

2
.github/workflows/ci.yml vendored
View file

@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
CARGO_BUILD_TARGET: ${{ matrix.target }} CARGO_BUILD_TARGET: ${{ matrix.target }}
JUST_USE_CROSS: true JUST_USE_CARGO_ZIGBUILD: true
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

2
.github/workflows/release-build.yml vendored
View file

@ -34,7 +34,7 @@ jobs:
runs-on: ${{ matrix.o }} runs-on: ${{ matrix.o }}
env: env:
CARGO_BUILD_TARGET: ${{ matrix.t }} CARGO_BUILD_TARGET: ${{ matrix.t }}
JUST_USE_CROSS: ${{ matrix.c }} JUST_USE_CARGO_ZIGBUILD: ${{ matrix.c }}
JUST_FOR_RELEASE: true JUST_FOR_RELEASE: true
steps: steps:

9
justfile
View file

@ -2,6 +2,7 @@
ci := env_var_or_default("CI", "") ci := env_var_or_default("CI", "")
for-release := env_var_or_default("JUST_FOR_RELEASE", "") for-release := env_var_or_default("JUST_FOR_RELEASE", "")
use-cross := env_var_or_default("JUST_USE_CROSS", "") use-cross := env_var_or_default("JUST_USE_CROSS", "")
use-cargo-zigbuild := env_var_or_default("JUST_USE_CARGO_ZIGBUILD", "")
extra-build-args := env_var_or_default("JUST_EXTRA_BUILD_ARGS", "") extra-build-args := env_var_or_default("JUST_EXTRA_BUILD_ARGS", "")
extra-features := env_var_or_default("JUST_EXTRA_FEATURES", "") extra-features := env_var_or_default("JUST_EXTRA_FEATURES", "")
default-features := env_var_or_default("JUST_DEFAULT_FEATURES", "") default-features := env_var_or_default("JUST_DEFAULT_FEATURES", "")
@ -36,7 +37,7 @@ output-folder := if target != target-host { "target" / target / output-profile-f
output-path := output-folder / output-filename output-path := output-folder / output-filename
# which tool to use for compiling # which tool to use for compiling
cargo-bin := if use-cross != "" { "cross" } else { "cargo +nightly" } cargo-bin := if use-cargo-zigbuild != "" { "cargo-zigbuild" } else if use-cross != "" { "cross" } else { "cargo +nightly" }
# cargo compile options # cargo compile options
cargo-profile := if for-release != "" { "release" } else { "dev" } cargo-profile := if for-release != "" { "release" } else { "dev" }
@ -52,7 +53,7 @@ cargo-buildstd := if (cargo-profile / ci-or-no) == "release/ci" {
# In musl release builds in CI, statically link gcclibs. # In musl release builds in CI, statically link gcclibs.
rustc-gcclibs := if (cargo-profile / ci-or-no / target-libc) == "release/ci/musl" { rustc-gcclibs := if (cargo-profile / ci-or-no / target-libc) == "release/ci/musl" {
" -C link-arg=-lgcc -C link-arg=-static-libgcc" if use-cargo-zigbuild != "" { "-C link-arg=-static-libgcc" } else { " -C link-arg=-lgcc -C link-arg=-static-libgcc" }
} else { "" } } else { "" }
# disable default features in CI for debug builds, for speed # disable default features in CI for debug builds, for speed
@ -94,8 +95,8 @@ ci-apt-deps := if target == "x86_64-unknown-linux-gnu" { "liblzma-dev libzip-dev
[linux] [linux]
ci-install-deps: ci-install-deps:
{{ if ci-apt-deps == "" { "exit" } else { "" } }} if [ -n "{{ci-apt-deps}}" ]; then sudo apt update && sudo apt install -y --no-install-recommends {{ci-apt-deps}}; fi
sudo apt update && sudo apt install -y --no-install-recommends {{ci-apt-deps}} pip3 install cargo-zigbuild
[macos] [macos]
[windows] [windows]