diff options
| author | Ralf Jung <post@ralfj.de> | 2024-03-24 10:39:48 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-03-24 10:39:48 +0100 |
| commit | 1dd13ca1b1d979d10c717aa5d426e4edd6b45df1 (patch) | |
| tree | 39ba47f8da1ae1f471c1e213e804434cdca8769f /src | |
| parent | 8e978c335c54b988712c107aede81d28c5fe744f (diff) | |
| download | rust-1dd13ca1b1d979d10c717aa5d426e4edd6b45df1.tar.gz rust-1dd13ca1b1d979d10c717aa5d426e4edd6b45df1.zip | |
miri script: build with stable toolchain
Diffstat (limited to 'src')
| -rwxr-xr-x | src/tools/miri/miri | 2 | ||||
| -rw-r--r-- | src/tools/miri/miri.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/miri/miri b/src/tools/miri/miri index 169f4521f2d..5f71fc94438 100755 --- a/src/tools/miri/miri +++ b/src/tools/miri/miri @@ -3,5 +3,5 @@ set -e # Instead of doing just `cargo run --manifest-path .. $@`, we invoke miri-script binary directly. Invoking `cargo run` goes through # rustup (that sets it's own environmental variables), which is undesirable. MIRI_SCRIPT_TARGET_DIR="$(dirname "$0")"/miri-script/target -cargo build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml +cargo +stable build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml "$MIRI_SCRIPT_TARGET_DIR"/debug/miri-script "$@" diff --git a/src/tools/miri/miri.bat b/src/tools/miri/miri.bat index 959e54d8844..18baa683f65 100644 --- a/src/tools/miri/miri.bat +++ b/src/tools/miri/miri.bat @@ -5,7 +5,7 @@ set MIRI_SCRIPT_TARGET_DIR=%0\..\miri-script\target :: If any other steps are added, the "|| exit /b" must be appended to early :: return from the script. If not, it will continue execution. -cargo build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml || exit /b +cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml || exit /b :: Forwards all arguments to this file to the executable. :: We invoke the binary directly to avoid going through rustup, which would set some extra |