Merge branch 'master' into 'master'

Fix running qemu with aarch64 on MacOS See merge request redox-os/redox!1332
2023-05-01 13:02:08 +00:00 · 2023-05-01 13:02:08 +00:00 · 92ed5c09f1
parent abe631aaa2 025cf84c86
commit 92ed5c09f1
1 changed files with 4 additions and 0 deletions
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@ -108,6 +108,10 @@ ifeq ($(UNAME),Linux)
 	endif
 endif

+ifeq ($(UNAME),Darwin)
+	QEMUFLAGS+=-cpu $(QEMU_CPU)
+endif
+
 ifeq ($(UNAME),Linux)
 $(BUILD)/extra.img:
 	fallocate --posix --length 1G $@