mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-07 00:19:27 +00:00
Toolchain: Fix self-built QEMU crashing on startup on macOS
If the SDL libraries are present on the system, QEMU will attempt to use that for rendering the UI. This causes a crash when the AArch64 port starts up with the following message: > NSWindow drag regions should only be invalidated on the Main Thread! Fix this by explicitly disabling SDL support.
This commit is contained in:
parent
6aa392f6e4
commit
a7f61a15af
|
@ -53,9 +53,13 @@ if [ -z "$MAKEJOBS" ]; then
|
||||||
MAKEJOBS=$(nproc)
|
MAKEJOBS=$(nproc)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
EXTRA_ARGS=""
|
||||||
if [[ $(uname) == "Darwin" ]]
|
if [[ $(uname) == "Darwin" ]]
|
||||||
then
|
then
|
||||||
UI_LIB=cocoa
|
UI_LIB=cocoa
|
||||||
|
|
||||||
|
# SDL causes a crash on startup: "NSWindow drag regions should only be invalidated on the Main Thread!"
|
||||||
|
EXTRA_ARGS="--disable-sdl"
|
||||||
else
|
else
|
||||||
UI_LIB=gtk
|
UI_LIB=gtk
|
||||||
fi
|
fi
|
||||||
|
@ -66,7 +70,8 @@ pushd "$DIR/Build/qemu"
|
||||||
"$DIR"/Tarballs/qemu-"${QEMU_VERSION}"/configure --prefix="$PREFIX" \
|
"$DIR"/Tarballs/qemu-"${QEMU_VERSION}"/configure --prefix="$PREFIX" \
|
||||||
--target-list=aarch64-softmmu,x86_64-softmmu \
|
--target-list=aarch64-softmmu,x86_64-softmmu \
|
||||||
--enable-$UI_LIB \
|
--enable-$UI_LIB \
|
||||||
--enable-slirp || exit 1
|
--enable-slirp \
|
||||||
|
$EXTRA_ARGS || exit 1
|
||||||
make -j "$MAKEJOBS" || exit 1
|
make -j "$MAKEJOBS" || exit 1
|
||||||
make install || exit 1
|
make install || exit 1
|
||||||
popd
|
popd
|
||||||
|
|
Loading…
Reference in a new issue