user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Install binaries to the miri toolchain's sysroot

Browse source
This commit is contained in:
Ben Kimock 2023-03-06 21:30:16 -05:00
parent 9f3c3ffaf8
commit ca9d50982d
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tools/miri/ci.sh
View file

@ -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

5
src/tools/miri/miri
View file

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