OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure: do not limit Hypervisor.framework test to Darwin

Browse Source 
Because the target/i386/hvf/meson.build rule culls hvf support
on non-Darwin systems, a --enable-hvf build is succeeding.
To fix this, just try the compilation test every time someone
passes --enable-hvf.

Reported-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-09-01 11:34:18 -04:00
parent b4e312e953
commit 61f8641644
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -870,7 +870,7 @@ Darwin)
bsd="yes" bsd="yes"
darwin="yes" darwin="yes"
hax="yes" hax="yes"
hvf="yes" hvf=""
if [ "$cpu" = "x86_64" ] ; then if [ "$cpu" = "x86_64" ] ; then
QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS" QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS"
QEMU_LDFLAGS="-arch x86_64 $QEMU_LDFLAGS" QEMU_LDFLAGS="-arch x86_64 $QEMU_LDFLAGS"
@ -5823,16 +5823,18 @@ fi
################################################# #################################################
# Check to see if we have the Hypervisor framework # Check to see if we have the Hypervisor framework
if [ "$darwin" = "yes" ] ; then if [ "$hvf" != "no" ] ; then
cat > $TMPC << EOF cat > $TMPC << EOF
#include <Hypervisor/hv.h> #include <Hypervisor/hv.h>
int main() { return 0;} int main() { return 0;}
EOF EOF
if ! compile_object ""; then if ! compile_object ""; then
if test "$hvf" = "yes"; then
error_exit "Hypervisor.framework not available"
fi
hvf='no' hvf='no'
else else
hvf='yes' hvf='yes'
QEMU_LDFLAGS="-framework Hypervisor $QEMU_LDFLAGS"
fi fi
fi fi