From a5e9247952b7e912ad47edd3f745d64dba63b593 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Fri, 14 Mar 2025 00:17:08 +0800 Subject: [PATCH] chore: cross build update with clang installed --- .github/workflows/build-nightly-release.yml | 6 ++-- .github/workflows/build-release.yml | 6 ++-- Cross.toml | 36 ++++++++++++--------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-nightly-release.yml b/.github/workflows/build-nightly-release.yml index 3d923fda..6311b4da 100644 --- a/.github/workflows/build-nightly-release.yml +++ b/.github/workflows/build-nightly-release.yml @@ -38,7 +38,7 @@ jobs: rustup override set ${{ matrix.platform.toolchain }} - name: Install cross - run: cargo install cross + run: cargo install cross --git https://github.com/cross-rs/cross - name: Build ${{ matrix.platform.target }} timeout-minutes: 120 @@ -58,11 +58,11 @@ jobs: fi compile_nightly="-n" - compile_features="-Z build-std=std,panic_abort,proc_macro" + #compile_cargo_flags="-Z build-std=std,panic_abort,proc_macro" fi cd build - ./build-release -t ${{ matrix.platform.target }} $compile_features $compile_compress $compile_nightly $compile_features + ./build-release -t ${{ matrix.platform.target }} $compile_features $compile_compress $compile_nightly $compile_cargo_flags - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 599b9054..df4c2352 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -82,7 +82,7 @@ jobs: rustup override set ${{ matrix.platform.toolchain }} - name: Install cross - run: cargo install cross + run: cargo install cross --git https://github.com/cross-rs/cross - name: Build ${{ matrix.platform.target }} timeout-minutes: 120 @@ -102,11 +102,11 @@ jobs: fi compile_nightly="-n" - compile_features="-Z build-std=std,panic_abort,proc_macro" + #compile_cargo_flags="-Z build-std=std,panic_abort,proc_macro" fi cd build - ./build-release -t ${{ matrix.platform.target }} $compile_features $compile_compress $compile_nightly $compile_features + ./build-release -t ${{ matrix.platform.target }} $compile_features $compile_compress $compile_nightly $compile_cargo_flags - name: Upload Github Assets uses: softprops/action-gh-release@v2 diff --git a/Cross.toml b/Cross.toml index 44542430..e9cbe678 100644 --- a/Cross.toml +++ b/Cross.toml @@ -6,6 +6,10 @@ # "cargo install --force --locked bindgen-cli && mv $HOME/.cargo/bin/bindgen /usr/bin", # "rm -rf $HOME/.cargo" # ] +pre-build = [ + "apt update", + "apt install --assume-yes --no-install-recommends build-essential llvm-8-dev libclang-8-dev clang-8", +] [build.env] passthrough = ["RUSTFLAGS"] @@ -13,19 +17,19 @@ passthrough = ["RUSTFLAGS"] # MIPS targets are dropped to Tier 3 # https://github.com/rust-lang/compiler-team/issues/648 # FIXME: build-std with sequence is supported only on git -# [target.mips-unknown-linux-gnu] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mips-unknown-linux-musl] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mips64-unknown-linux-gnuabi64] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mips64-unknown-linux-muslabi64] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mips64el-unknown-linux-gnuabi64] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mips64el-unknown-linux-muslabi64] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mipsel-unknown-linux-gnu] -# build-std = ["std", "panic_abort", "proc_macro"] -# [target.mipsel-unknown-linux-musl] -# build-std = ["std", "panic_abort", "proc_macro"] +[target.mips-unknown-linux-gnu] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mips-unknown-linux-musl] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mips64-unknown-linux-gnuabi64] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mips64-unknown-linux-muslabi64] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mips64el-unknown-linux-gnuabi64] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mips64el-unknown-linux-muslabi64] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mipsel-unknown-linux-gnu] +build-std = ["std", "panic_abort", "proc_macro"] +[target.mipsel-unknown-linux-musl] +build-std = ["std", "panic_abort", "proc_macro"]