Merge pull request #87 from RalfJung/portable-simd-toolchain-issue

delete portable-simd/rust-toolchain file
rust-lang · Feb 11, 2025 · 3482348 · 3482348
2 parents 04de949 + 55cfef2
commit 3482348
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ci-test.sh b/ci-test.sh
@@ -3,6 +3,9 @@ set -euo pipefail
 
 DEFAULTFLAGS="-Zrandomize-layout -Zmiri-strict-provenance"
 
+# make sure we keep using the current toolchain even in subdirs that have a toolchain file
+export RUSTUP_TOOLCHAIN=$(rustup show active-toolchain | cut -f 1 -d' ')
+
 # apply our patch
 rm -rf rust-src-patched
 cp -a $(rustc --print sysroot)/lib/rustlib/src/rust/ rust-src-patched

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-nightly-2025-02-01
+nightly-2025-02-11