diff options
| author | Sam James <sam@gentoo.org> | 2025-07-31 17:25:14 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-08-07 19:41:38 -0400 |
| commit | 14c2300ddefcb5d92f099bd8661ee8edd33cc73a (patch) | |
| tree | ad571ef412e762b445380097e4f81fd7a1191b5c | |
| parent | e99253c1bd452e385c9f20ca63d5e06c85759972 (diff) | |
| download | meson-master.zip meson-master.tar.gz meson-master.tar.bz2 | |
a16ec8b0fb6d7035b669a13edd4d97ff0c307a0b changed the threshold to 17
for Apple Clang, but it needs to be 16 instead.
Bug: https://github.com/mesonbuild/meson/issues/14440
Closes: https://github.com/mesonbuild/meson/issues/14856
| -rw-r--r-- | mesonbuild/compilers/cpp.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index ed8d1cf..fa032ec 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -349,9 +349,10 @@ class AppleClangCPPCompiler(AppleCompilerMixin, AppleCPPStdsMixin, ClangCPPCompi def is_libcpp_enable_assertions_deprecated(self) -> bool: # Upstream libc++ deprecated _LIBCPP_ENABLE_ASSERTIONS # in favor of _LIBCPP_HARDENING_MODE from version 18 onwards, - # but Apple Clang 17's libc++ has back-ported that change. - # See: https://github.com/mesonbuild/meson/issues/14440 - return version_compare(self.version, ">=17") + # but Apple Clang 16's libc++ has back-ported that change. + # See: https://github.com/mesonbuild/meson/issues/14440 and + # https://github.com/mesonbuild/meson/issues/14856 + return version_compare(self.version, ">=16") class EmscriptenCPPCompiler(EmscriptenMixin, ClangCPPCompiler): |