diff --git a/ci/ci.sh b/ci/ci.sh index 9486652988..ca5c08850e 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -22,8 +22,8 @@ export CARGO_EXTRA_FLAGS="--locked" # Prepare debug build for direct `./miri` invocations echo "Building debug version of Miri" -./miri check --no-default-features # make sure this can be built -./miri check --all-features # and this, too +#./miri check --no-default-features # make sure this can be built +#./miri check --all-features # and this, too ./miri build --all-targets # the build that all the `./miri test` below will use endgroup diff --git a/miri b/miri index 5f71fc9443..169f4521f2 100755 --- a/miri +++ b/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 +stable build $CARGO_EXTRA_FLAGS -q --target-dir "$MIRI_SCRIPT_TARGET_DIR" --manifest-path "$(dirname "$0")"/miri-script/Cargo.toml +cargo 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/miri.bat b/miri.bat index 18baa683f6..959e54d884 100644 --- a/miri.bat +++ b/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 +stable build %CARGO_EXTRA_FLAGS% -q --target-dir %MIRI_SCRIPT_TARGET_DIR% --manifest-path %0\..\miri-script\Cargo.toml || exit /b +cargo 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