system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-06 00:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta: Fix "Meta/serenity.sh run x86_64 Clang" on M1 Macs

Browse source 
QEMU crashes on M1 Macs when using `--accel hvf` option.

To solve this, detect the host's architecture and only add the
`--accel hvf` parameter if we are running on a "x86_64" machine.
This will allow "arm64" machines like M1 Macs to work correctly.
This commit is contained in:
serenityosrocks 2022-01-29 15:27:59 -08:00 committed by Brian Gianforcaro
parent 89cd00b540
commit 7371d16b03
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Meta/run.sh
View file

@ -38,8 +38,10 @@ if [ "$(uname)" = "Darwin" ]; then
[ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-aarch64"
fi
if $SERENITY_QEMU_BIN --accel help | grep -q hvf; then
SERENITY_VIRT_TECH_ARG="--accel hvf"
if [ "$(uname -m)" = "x86_64" ]; then
if $SERENITY_QEMU_BIN --accel help | grep -q hvf; then
SERENITY_VIRT_TECH_ARG="--accel hvf"
fi
fi
fi