This is a slight violation of our platform support policy since
current NetBSD only has GCC 10.4 as its system compiler. It
does, however, have new enough CLang and newer GCC versions can
be opted-in.

Signed-off-by: Daniel P. Berrangé <[email protected]>
---
 meson.build     | 4 ++--
 tests/vm/netbsd | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index fc1bb685ab..9845317b73 100644
--- a/meson.build
+++ b/meson.build
@@ -326,7 +326,7 @@ endif
 
 foreach lang : all_languages
   compiler = meson.get_compiler(lang)
-  if compiler.get_id() == 'gcc' and 
compiler.version().version_compare('>=10.4')
+  if compiler.get_id() == 'gcc' and 
compiler.version().version_compare('>=12.0')
     # ok
   elif compiler.get_id() == 'clang' and compiler.compiles('''
       #ifdef __apple_build_version__
@@ -342,7 +342,7 @@ foreach lang : all_languages
   elif compiler.get_id() == 'emscripten'
     # ok
   else
-    error('You either need GCC v10.4 or Clang v17.0 (or XCode Clang v17.0) to 
compile QEMU')
+    error('You either need GCC v12.0 or Clang v17.0 (or XCode Clang v17.0) to 
compile QEMU')
   endif
 endforeach
 
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index a9879f6146..749116d3dc 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -61,6 +61,9 @@ class NetBSDVM(basevm.BaseVM):
 
         # libs: networking
         "libslirp",
+
+        # Until system GCC is updated to >= 12.0
+        "clang",
     ]
 
     BUILD_SCRIPT = """
@@ -72,7 +75,8 @@ class NetBSDVM(basevm.BaseVM):
         tar -xf /dev/rld1a
         cd ../build
         ../src/configure --disable-opengl --extra-ldflags=-L/usr/pkg/lib \
-                         --extra-cflags=-I/usr/pkg/include {configure_opts}
+                         --extra-cflags=-I/usr/pkg/include {configure_opts} \
+                         --cc=clang
         gmake --output-sync -j{jobs} {target} {verbose}
     """
     poweroff = "/sbin/poweroff"
-- 
2.55.0


Reply via email to