Skip to content

Commit 9a42436

Browse files
committed
Auto merge of rust-lang#3703 - RossSmyth:ms-err, r=RalfJung
nicer batch file error when building miri-script fails rust-lang/miri#3700 (comment)
2 parents a25cb8a + 22bbff1 commit 9a42436

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/tools/miri/miri.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ set MIRI_SCRIPT_TARGET_DIR=%0\..\miri-script\target
55

66
:: If any other steps are added, the "|| exit /b" must be appended to early
77
:: return from the script. If not, it will continue execution.
8-
cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml || exit /b
8+
cargo +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml ^
9+
|| echo Failed to build miri-script. Is the 'stable' toolchain installed? & exit /b
910

1011
:: Forwards all arguments to this file to the executable.
1112
:: We invoke the binary directly to avoid going through rustup, which would set some extra

0 commit comments

Comments
 (0)