aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2024-03-11 12:02:42 +0000
committerPeter Maydell <peter.maydell@linaro.org>2024-03-11 12:02:42 +0000
commit2e0e475115e711bcf9742daa1a305be82ab826b6 (patch)
tree361911a73ccbfa09dfa456882bc3ec9e3eb5079c
parent7489f7f3f81dcb776df8c1b9a9db281fc21bf05f (diff)
meson.build: Always require an objc compiler on macos hostsnococoa
We currently only insist that an ObjectiveC compiler is present on macos hosts if we're building the Cocoa UI. However, since then we've added some other parts of QEMU which are also written in ObjC: the coreaudio audio backend, and the vmnet net backend. This means that if you try to configure QEMU on macos with --disable-cocoa the build will fail: ../meson.build:3741:13: ERROR: No host machine compiler for 'audio/coreaudio.m' Since in practice any macos host will have an ObjC compiler available, rather than trying to gate the compiler detection on an increasingly complicated list of every bit of QEMU that uses ObjC, just require it unconditionally on macos hosts. Resolves https://gitlab.com/qemu-project/qemu/-/issues/2138 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index f9dbe7634e..e3fab8ce9f 100644
--- a/meson.build
+++ b/meson.build
@@ -66,7 +66,7 @@ if host_os == 'windows' and add_languages('cpp', required: false, native: false)
cxx = meson.get_compiler('cpp')
endif
if host_os == 'darwin' and \
- add_languages('objc', required: get_option('cocoa'), native: false)
+ add_languages('objc', required: true, native: false)
all_languages += ['objc']
objc = meson.get_compiler('objc')
endif