user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1947 - RalfJung:macos-is-from-the-stone-age, r=RalfJung

Browse source 
macOS-compatible realpath

Make behavior consistent between Linux and macOS even though macOS lacks some basic shell tools
This commit is contained in:
bors 2021-12-20 22:17:40 +00:00
commit e969615937
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
miri
View file

@ -39,12 +39,8 @@ EOF
TARGET=$(rustc --version --verbose | grep "^host:" | cut -d ' ' -f 2)
SYSROOT=$(rustc --print sysroot)
LIBDIR=$SYSROOT/lib/rustlib/$TARGET/lib
if readlink -e . &>/dev/null; then
# This platform supports `readlink -e`.
MIRIDIR=$(dirname "$(readlink -e "$0")")
else
MIRIDIR=$(dirname "$0")
fi
# macOS does not have a useful readlink/realpath so we have to use Python instead...
MIRIDIR=$(dirname "$(python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$0")")
if ! test -d "$LIBDIR"; then
echo "Something went wrong determining the library dir."
echo "I got $LIBDIR but that does not exist."