Auto merge of #1820 - Aaron1011:rustup-const-err, r=RalfJung

[rust.git] / miri

diff --git a/miri b/miri
index 15bfeed4da06ccda3d0b11d799fd64ba65d9380e..337b2a496de878ff7c86f183f98542a082869797 100755 (executable)
--- a/miri
+++ b/miri
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 USAGE=$(cat <<"EOF"
   COMMANDS
@@ -11,6 +11,9 @@ working directory.
 ./miri build <flags>:
 Just build miri.  <flags> are passed to `cargo build`.
 
+./miri check <flags>:
+Just check miri.  <flags> are passed to `cargo check`.
+
 ./miri test <flags>:
 Build miri, set up a sysroot and then run the test suite. <flags> are passed
 to the final `cargo test` invocation.
@@ -36,53 +39,53 @@ EOF
 TARGET=$(rustc --version --verbose | grep "^host:" | cut -d ' ' -f 2)
 SYSROOT=$(rustc --print sysroot)
 LIBDIR=$SYSROOT/lib/rustlib/$TARGET/lib
+MIRIDIR=$(dirname "$0")
+if readlink -e . &>/dev/null; then
+    # This platform supports `readlink -e`.
+    MIRIDIR=$(readlink -e "$MIRIDIR")
+fi
 if ! test -d "$LIBDIR"; then
     echo "Something went wrong determining the library dir."
     echo "I got $LIBDIR but that does not exist."
     echo "Please report a bug at https://github.com/rust-lang/miri/issues."
     exit 2
 fi
+if [ -z "$CARGO_INCREMENTAL" ]; then
+    # Default CARGO_INCREMENTAL to 1.
+    export CARGO_INCREMENTAL=1
+fi
+if [ -z "$CARGO_TARGET_DIR" ]; then
+    # Share target dir between `miri` and `cargo-miri`.
+    export CARGO_TARGET_DIR="$MIRIDIR/target"
+fi
 # We set the rpath so that Miri finds the private rustc libraries it needs.
 # We enable debug-assertions to get tracing.
 # We enable line-only debuginfo for backtraces.
-export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1"
+export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1 $RUSTFLAGS"
 
 ## Helper functions
 
 # Build a sysroot and set MIRI_SYSROOT to use it.  Arguments are passed to `cargo miri setup`.
 build_sysroot() {
     # Build once, for the user to see.
-    cargo run $CARGO_BUILD_FLAGS --bin cargo-miri -- miri setup "$@"
+    cargo run $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml -- miri setup "$@"
     # Call again, to just set env var.
-    eval $(cargo run $CARGO_BUILD_FLAGS -q --bin cargo-miri -- miri setup --env "$@")
+    export MIRI_SYSROOT="$(cargo run $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml -q -- miri setup --print-sysroot "$@")"
 }
 
 # Prepare and set MIRI_SYSROOT.  Respects `MIRI_TEST_TARGET` and takes into account
 # locally built vs. distributed rustc.
 find_sysroot() {
-    # Get ourselves a sysroot
     if [ -n "$MIRI_SYSROOT" ]; then
         # Sysroot already set, use that.
-        true
-    elif echo "$SYSROOT" | egrep -q 'build/[^/]+/stage'; then
-        # A local rustc build.
-        if [ -n "$MIRI_TEST_TARGET" ]; then
-            # Foreign targets still need a build.  Use the rustc sources.
-            export XARGO_RUST_SRC="$SYSROOT/../../../src"
-            build_sysroot --target "$MIRI_TEST_TARGET"
-        else
-            # Assume we have a proper host libstd in $SYSROOT.
-            MIRI_SYSROOT="$SYSROOT"
-        fi
+        return 0
+    fi
+    # We need to build a sysroot.
+    if [ -n "$MIRI_TEST_TARGET" ]; then
+        build_sysroot --target "$MIRI_TEST_TARGET"
     else
-        # A normal toolchain.  We have to build a sysroot either way.
-        if [ -n "$MIRI_TEST_TARGET" ]; then
-            build_sysroot --target "$MIRI_TEST_TARGET"
-        else
-            build_sysroot
-        fi
+        build_sysroot
     fi
-    export MIRI_SYSROOT
 }
 
 ## Main
@@ -96,12 +99,12 @@ COMMAND="$1"
 # <https://github.com/rust-lang/cargo/issues/6992>.
 case "$COMMAND" in
 *-debug)
-    CARGO_INSTALL_FLAGS="--debug $CARGO_EXTRA_FLAGS"
-    CARGO_BUILD_FLAGS="$CARGO_EXTRA_FLAGS"
+    CARGO_INSTALL_FLAGS="--target $TARGET --debug $CARGO_EXTRA_FLAGS"
+    CARGO_BUILD_FLAGS="--target $TARGET $CARGO_EXTRA_FLAGS"
     ;;
 *)
-    CARGO_INSTALL_FLAGS="$CARGO_EXTRA_FLAGS"
-    CARGO_BUILD_FLAGS="--release $CARGO_EXTRA_FLAGS"
+    CARGO_INSTALL_FLAGS="--target $TARGET $CARGO_EXTRA_FLAGS"
+    CARGO_BUILD_FLAGS="--target $TARGET --release $CARGO_EXTRA_FLAGS"
     ;;
 esac
 
@@ -110,17 +113,25 @@ case "$COMMAND" in
 install|install-debug)
     # "--locked" to respect the Cargo.lock file if it exists,
     # "--offline" to avoid querying the registry (for yanked packages).
-    exec cargo install $CARGO_INSTALL_FLAGS --path "$(dirname "$0")" --force --locked --offline "$@"
+    cargo install $CARGO_INSTALL_FLAGS --path "$MIRIDIR" --force --locked --offline "$@"
+    cargo install $CARGO_INSTALL_FLAGS --path "$MIRIDIR"/cargo-miri --force --locked --offline "$@"
+    ;;
+check|check-debug)
+    # Check, and let caller control flags.
+    cargo check $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml "$@"
+    cargo check $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml "$@"
     ;;
 build|build-debug)
     # Build, and let caller control flags.
-    exec cargo build $CARGO_BUILD_FLAGS "$@"
+    cargo build $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/Cargo.toml "$@"
+    cargo build $CARGO_BUILD_FLAGS --manifest-path "$MIRIDIR"/cargo-miri/Cargo.toml "$@"
     ;;
 test|test-debug)
     # First build and get a sysroot.
     cargo build $CARGO_BUILD_FLAGS
     find_sysroot
     # Then test, and let caller control flags.
+    # Only in root project as `cargo-miri` has no tests.
     exec cargo test $CARGO_BUILD_FLAGS "$@"
     ;;
 run|run-debug)
@@ -143,8 +154,10 @@ run|run-debug)
     exec cargo run $CARGO_BUILD_FLAGS -- --sysroot "$MIRI_SYSROOT" "$@"
     ;;
 *)
-    echo "Unknown command: $COMMAND"
-    echo
+    if [ -n "$COMMAND" ]; then
+      echo "Unknown command: $COMMAND"
+      echo
+    fi
     echo "$USAGE"
     exit 1
 esac