Merge branch 'master' into 'master'
Fix running qemu with aarch64 on MacOS See merge request redox-os/redox!1332
This commit is contained in:
commit
92ed5c09f1
|
@ -108,6 +108,10 @@ ifeq ($(UNAME),Linux)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(UNAME),Darwin)
|
||||||
|
QEMUFLAGS+=-cpu $(QEMU_CPU)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(UNAME),Linux)
|
ifeq ($(UNAME),Linux)
|
||||||
$(BUILD)/extra.img:
|
$(BUILD)/extra.img:
|
||||||
fallocate --posix --length 1G $@
|
fallocate --posix --length 1G $@
|
||||||
|
|
Loading…
Reference in a new issue