1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Index: llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Driver/ToolChains/Linux.cpp
===================================================================
--- llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-19_19.1.2~++20241011093632+6c1fd539e43e/clang/lib/Driver/ToolChains/Linux.cpp
@@ -13,6 +13,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"
@@ -634,8 +635,18 @@ void Linux::AddClangSystemIncludeArgs(co
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;
|
