ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

newer versions of qemu have different binary names (per Joel Nider <joel@nider.org>)

Browse source
This commit is contained in:
Frans Kaashoek 2014-07-31 11:08:28 -04:00
parent ff2783442e
commit 86188d9d49
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -29,7 +29,7 @@ OBJS = \
vm.o\ vm.o\
# Cross-compiling (e.g., on Mac OS X) # Cross-compiling (e.g., on Mac OS X)
#TOOLPREFIX = i386-jos-elf- # TOOLPREFIX = i386-jos-elf
# Using native tools (e.g., on X86 Linux) # Using native tools (e.g., on X86 Linux)
#TOOLPREFIX = #TOOLPREFIX =
@ -51,12 +51,14 @@ TOOLPREFIX := $(shell if i386-jos-elf-objdump -i 2>&1 | grep '^elf32-i386$$' >/d
endif endif
# If the makefile can't find QEMU, specify its path here # If the makefile can't find QEMU, specify its path here
#QEMU = QEMU = qemu-system-i386
# Try to infer the correct QEMU # Try to infer the correct QEMU
ifndef QEMU ifndef QEMU
QEMU = $(shell if which qemu > /dev/null; \ QEMU = $(shell if which qemu > /dev/null; \
then echo qemu; exit; \ then echo qemu; exit; \
elif which qemu-system-i386 > /dev/null; \
then echo qemu-system-i386; exit; \
else \ else \
qemu=/Applications/Q.app/Contents/MacOS/i386-softmmu.app/Contents/MacOS/i386-softmmu; \ qemu=/Applications/Q.app/Contents/MacOS/i386-softmmu.app/Contents/MacOS/i386-softmmu; \
if test -x $$qemu; then echo $$qemu; exit; fi; fi; \ if test -x $$qemu; then echo $$qemu; exit; fi; fi; \