From 78b963e1119814e863da6c945057c041e4185144 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Tue, 28 Sep 2021 11:06:50 +0100 Subject: [PATCH] fix-clang-path-and-build =================================================================== Gbp-Pq: Name fix-clang-path-and-build.diff --- clang/lib/Driver/ToolChains/Linux.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp index 180350476..994bdfa2a 100644 --- a/clang/lib/Driver/ToolChains/Linux.cpp +++ b/clang/lib/Driver/ToolChains/Linux.cpp @@ -12,6 +12,7 @@ #include "Arch/PPC.h" #include "Arch/RISCV.h" #include "CommonArgs.h" +#include "clang/Basic/Version.h" #include "clang/Config/config.h" #include "clang/Driver/Distro.h" #include "clang/Driver/Driver.h" @@ -566,8 +567,18 @@ void Linux::AddClangSystemIncludeArgs(const ArgList &DriverArgs, SmallString<128> ResourceDirInclude(D.ResourceDir); llvm::sys::path::append(ResourceDirInclude, "include"); if (!DriverArgs.hasArg(options::OPT_nobuiltininc) && - (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc))) - addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude); + (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc))) { + if (llvm::sys::fs::exists(ResourceDirInclude)) { + /* Include the build include directory only + * Otherwise, it fails with stage2 when clang headers are available on the system + * they usually fail because of the include_next. Two llvm/clang headers are found + * while we are waiting for the lib C++ (std or not) + */ + addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude); + } else { + addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); + } + } if (DriverArgs.hasArg(options::OPT_nostdlibinc)) return; -- 2.30.2