From: Skgland Date: Sun, 24 May 2026 17:02:59 +0000 (+0200) Subject: configure linker via env var insread of .cargo/config.toml X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=1fd9246b1604aede6262dd0595effe6dc6e8639e;p=scryer-prolog.git configure linker via env var insread of .cargo/config.toml someone might already have a .cargo/config.toml --- diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index 8971f27a..00000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,2 +0,0 @@ -[target.s390x-unknown-linux-gnu] -linker = "/usr/bin/s390x-linux-gnu-gcc" diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index ebcb820c..e2bfc4de 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -35,13 +35,14 @@ runs: sudo apt-get install libssl-dev:i386 gcc-multilib clang -y echo "CC=clang" >> $GITHUB_ENV echo "PKG_CONFIG_SYSROOT_DIR=/" >> $GITHUB_ENV - + - name: Install s390x cross-compilation toolchain if: ${{ matrix.target == 's390x-unknown-linux-gnu' }} shell: bash run: | sudo apt-get update sudo apt-get install -y gcc-s390x-linux-gnu + echo "CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc" >> $GITHUB_ENV - uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4 with: