about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-06-23 06:36:12 +0000
committerbors <bors@rust-lang.org>2024-06-23 06:36:12 +0000
commit9a42436d1fe0ecd25ddb1f1397ca446c005c2dc3 (patch)
tree6a8cb5d6c1b2eafbc265fcfb175ccfb367f7cd92 /src/tools
parenta25cb8ab40745e8471614f20b4da852027e44caa (diff)
parent22bbff1c61ee32fd8621557b1cebcc4b39261f5f (diff)
downloadrust-9a42436d1fe0ecd25ddb1f1397ca446c005c2dc3.tar.gz
rust-9a42436d1fe0ecd25ddb1f1397ca446c005c2dc3.zip
Auto merge of #3703 - RossSmyth:ms-err, r=RalfJung
nicer batch file error when building miri-script fails

https://github.com/rust-lang/miri/pull/3700#issuecomment-2184026431
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/miri/miri.bat3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/miri/miri.bat b/src/tools/miri/miri.bat
index 18baa683f65..98b59a56a0d 100644
--- a/src/tools/miri/miri.bat
+++ b/src/tools/miri/miri.bat
@@ -5,7 +5,8 @@ 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 +stable 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 ^
+  || echo Failed to build miri-script. Is the 'stable' toolchain installed? & 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