Disable cross on x86_64 targets

rust-lang · Mar 7, 2024 · 309c473 · 309c473
1 parent 56f6c0b
commit 309c473
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -43,8 +43,6 @@ jobs:
     - env:
         TARGET: ${{ matrix.target }}
         CHANNEL: ${{ matrix.channel }}
-        CROSS: ${{ matrix.target != 'x86_64-unknown-linux-gnu' && '1' || '0' }}
-        NO_STD: ${{ matrix.target == 'thumbv6m-none-eabi' && '1' || '0' }}
       run: sh ci/run.sh
     strategy:
       matrix:

diff --git a/ci/run.sh b/ci/run.sh
@@ -4,6 +4,21 @@ set -ex
 
 : "${TARGET?The TARGET environment variable must be set.}"
 
+case "${TARGET}" in 
+    x86_64-unknown-linux-gnu|x86_64-apple-darwin|x86_64-pc-windows-msvc)
+        CROSS=0
+        NO_STD=0
+        ;;
+    thumbv6m-none-eabi)
+        CROSS=1
+        NO_STD=1
+        ;;
+    *)
+        CROSS=1
+        NO_STD=0
+        ;;
+esac
+
 CARGO=cargo
 if [ "${CROSS}" = "1" ]; then
     export CARGO_NET_RETRY=5