summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAntonio Gutierrez <[email protected]>2016-12-02 20:17:54 +0100
committerFrans Kaashoek <[email protected]>2017-01-30 20:03:45 -0500
commit1772853d392d3022b41f3893e41c5a5b65322fac (patch)
treee2ac61080fdd3cf49a708f3c3b613df5aab8b65e /Makefile
parent906610efc9dad4abeea0164c09e138a48bcd9882 (diff)
downloadxv6-labs-1772853d392d3022b41f3893e41c5a5b65322fac.tar.gz
xv6-labs-1772853d392d3022b41f3893e41c5a5b65322fac.tar.bz2
xv6-labs-1772853d392d3022b41f3893e41c5a5b65322fac.zip
Add support for qemu-system-x86_64 in 64bit hosts
As x86-64 is a superset of x86, we can use qemu-system-x86_64 to run the OS image. Signed-off-by: Antonio Gutierrez <[email protected]>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 93d525a..dd2afb8 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,8 @@ QEMU = $(shell if which qemu > /dev/null; \
then echo qemu; exit; \
elif which qemu-system-i386 > /dev/null; \
then echo qemu-system-i386; exit; \
+ elif which qemu-system-x86_64 > /dev/null; \
+ then echo qemu-system-x86_64; 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; \