]> Repositorios git - scryer-prolog.git/commitdiff
configure linker via env var insread of .cargo/config.toml
authorSkgland <[email protected]>
Sun, 24 May 2026 17:02:59 +0000 (19:02 +0200)
committerBennet Bleßmann <[email protected]>
Sun, 24 May 2026 17:08:23 +0000 (19:08 +0200)
someone might already have a .cargo/config.toml

.cargo/config.toml [deleted file]
.github/actions/setup-rust/action.yml

diff --git a/.cargo/config.toml b/.cargo/config.toml
deleted file mode 100644 (file)
index 8971f27..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-[target.s390x-unknown-linux-gnu]
-linker = "/usr/bin/s390x-linux-gnu-gcc"
index ebcb820c0dc5bad672da694eb63251a9d975138b..e2bfc4de277f3aa0f9efb0388d8d22d1906f1b6c 100644 (file)
@@ -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: