summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2014-07-31 11:08:28 -0400
committerFrans Kaashoek <[email protected]>2014-07-31 11:15:15 -0400
commit86188d9d49fe62a2f4d8b0677d33608b3b949336 (patch)
tree93924c81aae5d5c942951de3078278166dd600b7
parentff2783442ea2801a4bf6c76f198f36a6e985e7dd (diff)
downloadxv6-labs-86188d9d49fe62a2f4d8b0677d33608b3b949336.tar.gz
xv6-labs-86188d9d49fe62a2f4d8b0677d33608b3b949336.tar.bz2
xv6-labs-86188d9d49fe62a2f4d8b0677d33608b3b949336.zip
newer versions of qemu have different binary names (per Joel Nider <[email protected]>)
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 20cb884..dc94d82 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ OBJS = \
vm.o\
# Cross-compiling (e.g., on Mac OS X)
-#TOOLPREFIX = i386-jos-elf-
+# TOOLPREFIX = i386-jos-elf
# Using native tools (e.g., on X86 Linux)
#TOOLPREFIX =
@@ -51,12 +51,14 @@ TOOLPREFIX := $(shell if i386-jos-elf-objdump -i 2>&1 | grep '^elf32-i386$$' >/d
endif
# If the makefile can't find QEMU, specify its path here
-#QEMU =
+QEMU = qemu-system-i386
# Try to infer the correct QEMU
ifndef QEMU
QEMU = $(shell if which qemu > /dev/null; \
then echo qemu; exit; \
+ elif which qemu-system-i386 > /dev/null; \
+ then echo qemu-system-i386; exit; \
else \
qemu=/Applications/Q.app/Contents/MacOS/i386-softmmu.app/Contents/MacOS/i386-softmmu; \
if test -x $$qemu; then echo $$qemu; exit; fi; fi; \