diff options
| author | Ben Kimock <kimockb@gmail.com> | 2023-03-06 21:30:16 -0500 |
|---|---|---|
| committer | Ben Kimock <kimockb@gmail.com> | 2023-03-09 12:41:17 -0500 |
| commit | ca9d50982d4b2fd5abe09066afdadd57c674ff57 (patch) | |
| tree | 9e7e2d3e241a282d8a6ddda250c6f7279759fadc | |
| parent | 9f3c3ffaf83f9226f81c200c7bf8a04e4e3d5715 (diff) | |
| download | rust-ca9d50982d4b2fd5abe09066afdadd57c674ff57.tar.gz rust-ca9d50982d4b2fd5abe09066afdadd57c674ff57.zip | |
Install binaries to the miri toolchain's sysroot
| -rwxr-xr-x | src/tools/miri/ci.sh | 4 | ||||
| -rwxr-xr-x | src/tools/miri/miri | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/miri/ci.sh b/src/tools/miri/ci.sh index 60450d09815..ef52a37fe31 100755 --- a/src/tools/miri/ci.sh +++ b/src/tools/miri/ci.sh @@ -62,8 +62,8 @@ function run_tests { if [ "$HOST_TARGET" = x86_64-unknown-linux-gnu ]; then # These act up on Windows (`which miri` produces a filename that does not exist?!?), # so let's do this only on Linux. Also makes sure things work without these set. - export RUSTC=$(which rustc) - export MIRI=$(which miri) + export RUSTC=$(which rustc) # Produces a warning unless we also set MIRI + export MIRI=$(rustc +miri --print sysroot)/bin/miri fi mkdir -p .cargo echo 'build.rustc-wrapper = "thisdoesnotexist"' > .cargo/config.toml diff --git a/src/tools/miri/miri b/src/tools/miri/miri index 0c0bbbc7020..998e0d29524 100755 --- a/src/tools/miri/miri +++ b/src/tools/miri/miri @@ -281,8 +281,9 @@ find_sysroot() { case "$COMMAND" in install) # "--locked" to respect the Cargo.lock file if it exists. - $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR" --force --locked "$@" - $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR"/cargo-miri --force --locked "$@" + # Install binaries to the miri toolchain's sysroot so they do not interact with other toolchains + $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR" --force --locked --root "$SYSROOT" "$@" + $CARGO install $CARGO_EXTRA_FLAGS --path "$MIRIDIR"/cargo-miri --force --locked --root "$SYSROOT" "$@" ;; check) # Check, and let caller control flags. |