From 56f6c0b66711fa3d6dad3efc04b08b6e4ab9591a Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Wed, 6 Mar 2024 18:16:05 +0000
Subject: [PATCH] Use latest version of cross-rs from git

Works around https://github.com/cross-rs/cross/issues/1453
---
 ci/run.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/ci/run.sh b/ci/run.sh
index 6c692345c..d5fd72b21 100644
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -4,6 +4,17 @@ set -ex
 
 : "${TARGET?The TARGET environment variable must be set.}"
 
+CARGO=cargo
+if [ "${CROSS}" = "1" ]; then
+    export CARGO_NET_RETRY=5
+    export CARGO_NET_TIMEOUT=10
+
+    # Temporary workaround for https://github.com/cross-rs/cross/issues/1453
+    cargo install cross --git https://github.com/cross-rs/cross
+    #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 +23,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