diff options
| author | Joelle van Dyne | 2021-01-26 02:24:57 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-29 11:47:28 +0100 |
| commit | 32063086a731aaeb76e1a81623953f8a17fcdb6f (patch) | |
| tree | 7354cc9b7eddd0dd840fcaf88d4dc16a1cfb252b | |
| parent | darwin: detect CoreAudio for build (diff) | |
| download | qemu-32063086a731aaeb76e1a81623953f8a17fcdb6f.tar.gz qemu-32063086a731aaeb76e1a81623953f8a17fcdb6f.tar.xz qemu-32063086a731aaeb76e1a81623953f8a17fcdb6f.zip | |
darwin: remove 64-bit build detection on 32-bit OS
A workaround added in early days of 64-bit OSX forced x86_64 if the
host machine had 64-bit support. This creates issues when cross-
compiling for ARM64. Additionally, the user can always use --cpu=* to
manually set the host CPU and therefore this workaround should be
removed.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Joelle van Dyne <j@getutm.app>
Message-id: 20210126012457.39046-12-j@getutm.app
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -625,13 +625,6 @@ fi # the correct CPU with the --cpu option. case $targetos in Darwin) - # on Leopard most of the system is 32-bit, so we have to ask the kernel if we can - # run 64-bit userspace code. - # If the user didn't specify a CPU explicitly and the kernel says this is - # 64 bit hw, then assume x86_64. Otherwise fall through to the usual detection code. - if test -z "$cpu" && test "$(sysctl -n hw.optional.x86_64)" = "1"; then - cpu="x86_64" - fi HOST_DSOSUF=".dylib" ;; SunOS) @@ -775,10 +768,6 @@ OpenBSD) Darwin) bsd="yes" darwin="yes" - if [ "$cpu" = "x86_64" ] ; then - QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS" - QEMU_LDFLAGS="-arch x86_64 $QEMU_LDFLAGS" - fi audio_drv_list="try-coreaudio try-sdl" audio_possible_drivers="coreaudio sdl" # Disable attempts to use ObjectiveC features in os/object.h since they |