[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/24] build: move compiler version check to meson
From: |
Paolo Bonzini |
Subject: |
[PATCH 17/24] build: move compiler version check to meson |
Date: |
Thu, 11 May 2023 11:50:14 +0200 |
Use the slighly nicer .version_compare() function for GCC; for Clang that is
not possible due to the mess that Apple does with version numbers.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 25 -------------------------
meson.build | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index a7c3fcc26609..b58ea2aba1f3 100755
--- a/configure
+++ b/configure
@@ -1128,31 +1128,6 @@ if test "$targetos" = "bogus"; then
error_exit "Unrecognized host OS (uname -s reports '$(uname -s)')"
fi
-# Check whether the compiler matches our minimum requirements:
-cat > $TMPC << EOF
-#if defined(__clang_major__) && defined(__clang_minor__)
-# ifdef __apple_build_version__
-# if __clang_major__ < 12 || (__clang_major__ == 12 && __clang_minor__ < 0)
-# error You need at least XCode Clang v12.0 to compile QEMU
-# endif
-# else
-# if __clang_major__ < 10 || (__clang_major__ == 10 && __clang_minor__ < 0)
-# error You need at least Clang v10.0 to compile QEMU
-# endif
-# endif
-#elif defined(__GNUC__) && defined(__GNUC_MINOR__)
-# if __GNUC__ < 7 || (__GNUC__ == 7 && __GNUC_MINOR__ < 4)
-# error You need at least GCC v7.4.0 to compile QEMU
-# endif
-#else
-# error You either need GCC or Clang to compiler QEMU
-#endif
-int main (void) { return 0; }
-EOF
-if ! compile_prog "" "" ; then
- error_exit "You need at least GCC v7.4 or Clang v10.0 (or XCode Clang
v12.0)"
-fi
-
if test "$static" = "yes" ; then
if test "$plugins" = "yes"; then
error_exit "static and plugins are mutually incompatible"
diff --git a/meson.build b/meson.build
index 0c5d2cf634fa..a751d86bc3ea 100644
--- a/meson.build
+++ b/meson.build
@@ -190,6 +190,26 @@ endif
# Compiler flags #
##################
+foreach lang : all_languages
+ compiler = meson.get_compiler(lang)
+ if compiler.get_id() == 'gcc' and compiler.version().version_compare('>=7.4')
+ # ok
+ elif compiler.get_id() == 'clang' and compiler.compiles('''
+ #ifdef __apple_build_version__
+ # if __clang_major__ < 12 || (__clang_major__ == 12 && __clang_minor__ <
0)
+ # error You need at least XCode Clang v12.0 to compile QEMU
+ # endif
+ #else
+ # if __clang_major__ < 10 || (__clang_major__ == 10 && __clang_minor__ <
0)
+ # error You need at least Clang v10.0 to compile QEMU
+ # endif
+ #endif''')
+ # ok
+ else
+ error('You either need GCC v7.4 or Clang v10.0 (or XCode Clang v12.0) to
compile QEMU')
+ endif
+endforeach
+
# default flags for all hosts
# We use -fwrapv to tell the compiler that we require a C dialect where
# left shift of signed integers is well defined and has the expected
--
2.40.1
- [PATCH 08/24] configure: remove pkg-config functions, (continued)
- [PATCH 08/24] configure: remove pkg-config functions, Paolo Bonzini, 2023/05/11
- [PATCH 09/24] configure, meson: move --enable-modules to Meson, Paolo Bonzini, 2023/05/11
- [PATCH 06/24] meson: drop unnecessary declare_dependency(), Paolo Bonzini, 2023/05/11
- [PATCH 07/24] build: move glib detection and workarounds to meson, Paolo Bonzini, 2023/05/11
- [PATCH 10/24] meson: prepare move of QEMU_CFLAGS to meson, Paolo Bonzini, 2023/05/11
- [PATCH 11/24] build: move sanitizer tests to meson, Paolo Bonzini, 2023/05/11
- [PATCH 12/24] build: move SafeStack tests to meson, Paolo Bonzini, 2023/05/11
- [PATCH 13/24] build: move coroutine backend selection to meson, Paolo Bonzini, 2023/05/11
- [PATCH 14/24] build: move stack protector flag selection to meson, Paolo Bonzini, 2023/05/11
- [PATCH 15/24] build: move warning flag selection to meson, Paolo Bonzini, 2023/05/11
- [PATCH 17/24] build: move compiler version check to meson,
Paolo Bonzini <=
- [PATCH 02/24] meson: require 0.63.0, Paolo Bonzini, 2023/05/11
- [PATCH 16/24] build: move remaining compiler flag tests to meson, Paolo Bonzini, 2023/05/11
- [PATCH 19/24] configure: remove compiler sanity check, Paolo Bonzini, 2023/05/11
- [PATCH 22/24] configure: reorder option parsing code, Paolo Bonzini, 2023/05/11
- [PATCH 18/24] build: move --disable-debug-info to meson, Paolo Bonzini, 2023/05/11
- [PATCH 20/24] configure: do not rerun the tests with -Werror, Paolo Bonzini, 2023/05/11
- [PATCH 24/24] docs/devel: update build system docs, Paolo Bonzini, 2023/05/11
- [PATCH 21/24] configure: remove unnecessary mkdir, Paolo Bonzini, 2023/05/11
- [PATCH 23/24] configure: remove unnecessary check, Paolo Bonzini, 2023/05/11