diff options
| author | Ralf Jung <post@ralfj.de> | 2024-06-22 15:04:45 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-06-22 15:04:45 +0200 |
| commit | 699b7d43c28b487b33acbc61510bf467e0dc2e6e (patch) | |
| tree | f67c10e1b531b31d4cf0a7ac76248b47ac99fbac | |
| parent | de8f05c9e78595ccaa12349ca0246c7445566e57 (diff) | |
| download | rust-699b7d43c28b487b33acbc61510bf467e0dc2e6e.tar.gz rust-699b7d43c28b487b33acbc61510bf467e0dc2e6e.zip | |
./miri: nicer error when building miri-script fails
| -rwxr-xr-x | src/tools/miri/miri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/miri/miri b/src/tools/miri/miri index 5f71fc94438..07383bb59eb 100755 --- a/src/tools/miri/miri +++ b/src/tools/miri/miri @@ -3,5 +3,6 @@ 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 +stable 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 || \ + ( echo "Failed to build miri-script. Is the 'stable' toolchain installed?"; exit 1 ) "$MIRI_SCRIPT_TARGET_DIR"/debug/miri-script "$@" |