Disable cross on x86_64 targets

Author: Amanieu

.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:

ci/run.sh

@@ -4,6 +4,30 @@ 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
+    export CARGO_NET_TIMEOUT=10
+
+    cargo install --locked cross
+    CARGO=cross
+fi
+
 if [ "${NO_STD}" = "1" ]; then
     # Unfortunately serde currently doesn't work without std due to a cargo bug.
     FEATURES="rustc-internal-api"
@@ -12,20 +36,12 @@ else
     FEATURES="rustc-internal-api,serde,rayon,raw"
     OP="test"
 fi
+
 if [ "${CHANNEL}" = "nightly" ]; then
     FEATURES="${FEATURES},nightly"
     export RUSTFLAGS="$RUSTFLAGS -D warnings"
 fi
 
-CARGO=cargo
-if [ "${CROSS}" = "1" ]; then
-    export CARGO_NET_RETRY=5
-    export CARGO_NET_TIMEOUT=10
-
-    cargo install --locked cross
-    CARGO=cross
-fi
-
 # Make sure we can compile without the default hasher
 "${CARGO}" -vv build --target="${TARGET}" --no-default-features
 "${CARGO}" -vv build --target="${TARGET}" --release --no-default-features