https://github.com/rorth updated https://github.com/llvm/llvm-project/pull/212725
>From 6c1e69756696c56672c678a111fdb5b0f4bd2005 Mon Sep 17 00:00:00 2001 From: Rainer Orth <[email protected]> Date: Wed, 29 Jul 2026 11:27:31 +0200 Subject: [PATCH 1/2] [clang][Driver] Fix libc++ include path on FreeBSD `clang++` defaults to `-stdlib=libc++` on FreeBSD. When building with both `clang` and `libcxx` included, the freshly built `clang++` uses the system version of the `libc++` headers. However, this is from the bundled `libc++` 19.1.7, thus inconsistent with the `libc++` being built. Similarly to the NetBSD case, FreeBSD has its own version of addLibCxxIncludePaths which just includes `/usr/include/c++/v1`. Rather than replicating the generic version in `Gnu.cpp`, this patch just calls `Generic_GCC::addLibCxxIncludePaths`. Tested on `amd64-pc-freebsd15.1`. This breaks the `Driver/freebsd.cpp` and `Driver/freebsd-include-paths.c` testcases. Once it can be confirmed the approach is sound, I'll update them accordingly. --- clang/lib/Driver/ToolChains/FreeBSD.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp index 724ccbefd790f..519999a9a5bcf 100644 --- a/clang/lib/Driver/ToolChains/FreeBSD.cpp +++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -10,6 +10,7 @@ #include "Arch/ARM.h" #include "Arch/Mips.h" #include "Arch/Sparc.h" +#include "Gnu.h" #include "clang/Config/config.h" #include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" @@ -434,8 +435,7 @@ void FreeBSD::AddClangSystemIncludeArgs( void FreeBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { - addSystemInclude(DriverArgs, CC1Args, - concat(getDriver().SysRoot, "/usr/include/c++/v1")); + Generic_GCC::addLibCxxIncludePaths(DriverArgs, CC1Args); } void FreeBSD::AddCXXStdlibLibArgs(const ArgList &Args, >From 3cc4ebdf09c0595114044949fef1c37b206b5cb2 Mon Sep 17 00:00:00 2001 From: Rainer Orth <[email protected]> Date: Thu, 30 Jul 2026 17:00:50 +0200 Subject: [PATCH 2/2] Remove FreeBSD::addLibCxxIncludePaths. Add testcases. --- clang/lib/Driver/ToolChains/FreeBSD.cpp | 6 ------ clang/lib/Driver/ToolChains/FreeBSD.h | 2 -- clang/test/Driver/freebsd-include-paths.c | 3 ++- clang/test/Driver/freebsd.cpp | 6 ++++-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/clang/lib/Driver/ToolChains/FreeBSD.cpp b/clang/lib/Driver/ToolChains/FreeBSD.cpp index 519999a9a5bcf..dcf2973c364d1 100644 --- a/clang/lib/Driver/ToolChains/FreeBSD.cpp +++ b/clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -10,7 +10,6 @@ #include "Arch/ARM.h" #include "Arch/Mips.h" #include "Arch/Sparc.h" -#include "Gnu.h" #include "clang/Config/config.h" #include "clang/Driver/CommonArgs.h" #include "clang/Driver/Compilation.h" @@ -433,11 +432,6 @@ void FreeBSD::AddClangSystemIncludeArgs( concat(D.SysRoot, "/usr/include")); } -void FreeBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - Generic_GCC::addLibCxxIncludePaths(DriverArgs, CC1Args); -} - void FreeBSD::AddCXXStdlibLibArgs(const ArgList &Args, ArgStringList &CmdArgs) const { Generic_ELF::AddCXXStdlibLibArgs(Args, CmdArgs); diff --git a/clang/lib/Driver/ToolChains/FreeBSD.h b/clang/lib/Driver/ToolChains/FreeBSD.h index 55400e17b5ea4..a8f4226a88274 100644 --- a/clang/lib/Driver/ToolChains/FreeBSD.h +++ b/clang/lib/Driver/ToolChains/FreeBSD.h @@ -69,8 +69,6 @@ class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic_ELF { return ToolChain::CST_Libcxx; } - void addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const override; void AddCXXStdlibLibArgs(const llvm::opt::ArgList &Args, llvm::opt::ArgStringList &CmdArgs) const override; void AddCudaIncludeArgs(const llvm::opt::ArgList &DriverArgs, diff --git a/clang/test/Driver/freebsd-include-paths.c b/clang/test/Driver/freebsd-include-paths.c index 872b2386ce9f1..be8104c9ce7ce 100644 --- a/clang/test/Driver/freebsd-include-paths.c +++ b/clang/test/Driver/freebsd-include-paths.c @@ -11,6 +11,7 @@ // RUN: %clang -### -xc++ %s --target=x86_64-unknown-freebsd13.1 2>&1 \ // RUN: | FileCheck %s --check-prefix=DRIVER-PASS-INCLUDES-CXX // DRIVER-PASS-INCLUDES-CXX: "-cc1" {{.*}}"-resource-dir" "[[RESOURCE:[^"]+]]" -// DRIVER-PASS-INCLUDES-CXX-SAME: "-internal-isystem" "/usr/include/c++/v1" +// DRIVER-PASS-INCLUDES-CXX-SAME: "-internal-isystem" "{{.*}}bin/../include/c++/v1" +// DRIVER-PASS-INCLUDES-CXX-NOT: "-internal-isystem" "/usr/include/c++/v1" // DRIVER-PASS-INCLUDES-CXX-SAME: {{^}} "-internal-isystem" "[[RESOURCE]]/include" // DRIVER-PASS-INCLUDES-CXX-SAME: {{^}} "-internal-externc-isystem" "/usr/include" diff --git a/clang/test/Driver/freebsd.cpp b/clang/test/Driver/freebsd.cpp index e2f76cd013f7f..6b60be0594e9a 100644 --- a/clang/test/Driver/freebsd.cpp +++ b/clang/test/Driver/freebsd.cpp @@ -27,7 +27,8 @@ // RUN: | FileCheck --check-prefix=CHECK-LIBCXX-SYSROOT %s // CHECK-LIBCXX-SYSROOT: "-cc1" // CHECK-LIBCXX-SYSROOT-SAME: "-isysroot" "[[SYSROOT:[^"]+]]" -// CHECK-LIBCXX-SYSROOT-SAME: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1" +// CHECK-LIBCXX-SYSROOT-SAME: "-internal-isystem" "{{.*}}/bin/../include/c++/v1" +// CHECK-LIBCXX-SYSROOT-NOT: "-internal-isystem" "[[SYSROOT]]/usr/include/c++/v1" // Test include paths when the sysroot path ends with `/`. // RUN: %clangxx %s -### -fsyntax-only 2>&1 \ @@ -37,4 +38,5 @@ // RUN: | FileCheck --check-prefix=CHECK-LIBCXX-SYSROOT-SLASH %s // CHECK-LIBCXX-SYSROOT-SLASH: "-cc1" // CHECK-LIBCXX-SYSROOT-SLASH-SAME: "-isysroot" "[[SYSROOT:[^"]+/]]" -// CHECK-LIBCXX-SYSROOT-SLASH-SAME: "-internal-isystem" "[[SYSROOT]]usr/include/c++/v1" +// CHECK-LIBCXX-SYSROOT-SLASH-SAME: "-internal-isystem" "{{.*}}/bin/../include/c++/v1" +// CHECK-LIBCXX-SYSROOT-SLASH-NOT: "-internal-isystem" "[[SYSROOT]]usr/include/c++/v1" _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
