Skip to content

Commit 6005f5d

Browse files
committed
Auto merge of #2111 - RalfJung:python, r=RalfJung
stop relying on python being in the PATH Even Debian removed the package that provides `/usr/bin/python`; I guess it is time to move on.
2 parents 36c274a + a2f6837 commit 6005f5d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

miri

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TARGET=$(rustc --version --verbose | grep "^host:" | cut -d ' ' -f 2)
4040
SYSROOT=$(rustc --print sysroot)
4141
LIBDIR=$SYSROOT/lib/rustlib/$TARGET/lib
4242
# macOS does not have a useful readlink/realpath so we have to use Python instead...
43-
MIRIDIR=$(dirname "$(python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$0")")
43+
MIRIDIR=$(dirname "$(python3 -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' "$0")")
4444
if ! test -d "$LIBDIR"; then
4545
echo "Something went wrong determining the library dir."
4646
echo "I got $LIBDIR but that does not exist."

src/machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use rustc_span::symbol::{sym, Symbol};
2828
use rustc_target::abi::Size;
2929
use rustc_target::spec::abi::Abi;
3030

31-
use crate::{*, shims::posix::FileHandler};
31+
use crate::{shims::posix::FileHandler, *};
3232

3333
// Some global facts about the emulated machine.
3434
pub const PAGE_SIZE: u64 = 4 * 1024; // FIXME: adjust to target architecture

0 commit comments

Comments
 (0)