From 490441ca7c0024cfd56c94d4249b5ce01f8b506c Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 25 Mar 2024 15:22:26 -0400 Subject: [PATCH 1/2] [libc++][test] Skip module tests on FreeBSD for now FreeBSD's libc is noncompliant as noted in discussion in #86320. --- libcxx/utils/libcxx/test/features.py | 1 + 1 file changed, 1 insertion(+) diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py index 307d35349f3a4..0793c34fd7f0b 100644 --- a/libcxx/utils/libcxx/test/features.py +++ b/libcxx/utils/libcxx/test/features.py @@ -280,6 +280,7 @@ def _getAndroidDeviceApi(cfg): # This is not allowed per C11 7.1.2 Standard headers/6 # Any declaration of a library function shall have external linkage. when=lambda cfg: "__ANDROID__" in compilerMacros(cfg) + or "__FreeBSD__" in compilerMacros(cfg) or "_WIN32" in compilerMacros(cfg) or platform.system().lower().startswith("aix") # Avoid building on platforms that don't support modules properly. From 661b7dd82027975576578e281df72dfba264de3c Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Fri, 22 Mar 2024 14:06:04 -0400 Subject: [PATCH 2/2] [libc++] Switch FreeBSD CI job to Clang 17 libc++ will drop support for Clang 16 before long. --- libcxx/utils/ci/buildkite-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml index e42262620d5fb..31e794e67d330 100644 --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -209,8 +209,8 @@ steps: - label: FreeBSD 13 amd64 command: libcxx/utils/ci/run-buildbot generic-cxx23 env: - CC: clang16 - CXX: clang++16 + CC: clang17 + CXX: clang++17 agents: queue: libcxx-builders os: freebsd