Skip to content

Commit

Permalink
Auto merge of #1924 - RalfJung:ra, r=oli-obk
Browse files Browse the repository at this point in the history
hack to work around RA quirk

This is a gross hack to work around rust-lang/rust-analyzer#10793: calling `cargo-miri/miri` does the same thing as calling `./miri`.

`@oli-obk` this is the best I could come up with... not sure if we want to have this in the repo. I am also okay with carrying `cargo-miri/miri` locally.
  • Loading branch information
bors committed Nov 25, 2021
2 parents 73cf2ba + 5d71528 commit 0949cd3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions cargo-miri/miri
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
# Hack to work around https://github.com/rust-analyzer/rust-analyzer/issues/10793.
exec "$(dirname "$0")"/../miri "$@"
5 changes: 3 additions & 2 deletions miri
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ 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")
MIRIDIR=$(dirname "$(readlink -e "$0")")
else
MIRIDIR=$(dirname "$0")
fi
if ! test -d "$LIBDIR"; then
echo "Something went wrong determining the library dir."
Expand Down

0 comments on commit 0949cd3

Please sign in to comment.