From 3ca844bd94b25181d910b963942be04785b2de11 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 6 Apr 2026 01:00:32 +0300 Subject: [PATCH] meson: Use header for C++ library version check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ciso646 header has been removed in C++20. Use the version header instead. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Barnabás Pőcze --- meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index a6cfdd07..a411d171 100644 --- a/meson.build +++ b/meson.build @@ -118,10 +118,9 @@ cpp_arguments = [ '-Wnon-virtual-dtor', ] -# \todo Switch to `version` when moving to C++20 as `ciso646` has been removed in C++20. -if cxx.has_header_symbol('ciso646', '_LIBCPP_VERSION') +if cxx.has_header_symbol('version', '_LIBCPP_VERSION') cxx_stdlib = 'libc++' -elif cxx.has_header_symbol('ciso646', '__GLIBCXX__') +elif cxx.has_header_symbol('version', '__GLIBCXX__') cxx_stdlib = 'libstdc++' else error('C++ standard library cannot be detected')