https://github.com/brad0 updated https://github.com/llvm/llvm-project/pull/212979
>From 0fdba604a57b64f75cc40b7febbe7ca32a33f92d Mon Sep 17 00:00:00 2001 From: Brad Smith <[email protected]> Date: Thu, 30 Jul 2026 05:51:28 -0400 Subject: [PATCH] [clang][Driver] Fix libc++ include path on OpenBSD `clang++` defaults to `-stdlib=libc++` on OpenBSD. 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++` 22.1.8, thus inconsistent with the `libc++` being built. OpenBSD has its own version of addLibCxxIncludePaths which just includes `/usr/include/c++/v1`. This patch removes OpenBSD::addLibCxxIncludePaths in favour of the generic version in `Gnu.cpp`. --- clang/lib/Driver/ToolChains/OpenBSD.cpp | 6 ------ clang/lib/Driver/ToolChains/OpenBSD.h | 3 --- clang/test/Driver/openbsd.cpp | 6 ++++-- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/clang/lib/Driver/ToolChains/OpenBSD.cpp b/clang/lib/Driver/ToolChains/OpenBSD.cpp index 14680dc4b0e5b..efe64f8982c3b 100644 --- a/clang/lib/Driver/ToolChains/OpenBSD.cpp +++ b/clang/lib/Driver/ToolChains/OpenBSD.cpp @@ -345,12 +345,6 @@ void OpenBSD::AddClangSystemIncludeArgs( concat(D.SysRoot, "/usr/include")); } -void OpenBSD::addLibCxxIncludePaths(const llvm::opt::ArgList &DriverArgs, - llvm::opt::ArgStringList &CC1Args) const { - addSystemInclude(DriverArgs, CC1Args, - concat(getDriver().SysRoot, "/usr/include/c++/v1")); -} - void OpenBSD::AddCXXStdlibLibArgs(const ArgList &Args, ArgStringList &CmdArgs) const { bool Profiling = Args.hasArg(options::OPT_pg); diff --git a/clang/lib/Driver/ToolChains/OpenBSD.h b/clang/lib/Driver/ToolChains/OpenBSD.h index a92c4d321bac6..47c86d95313be 100644 --- a/clang/lib/Driver/ToolChains/OpenBSD.h +++ b/clang/lib/Driver/ToolChains/OpenBSD.h @@ -73,9 +73,6 @@ class LLVM_LIBRARY_VISIBILITY OpenBSD : public Generic_ELF { void AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const override; - - 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; diff --git a/clang/test/Driver/openbsd.cpp b/clang/test/Driver/openbsd.cpp index 01aa09b75f27f..93d421efe4903 100644 --- a/clang/test/Driver/openbsd.cpp +++ b/clang/test/Driver/openbsd.cpp @@ -28,7 +28,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 \ @@ -38,4 +39,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
