mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-11-04 04:22:11 +00:00
34 lines
1.7 KiB
Diff
34 lines
1.7 KiB
Diff
Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Driver/ToolChains/Linux.cpp
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Driver/ToolChains/Linux.cpp
|
|
+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/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"
|
|
@@ -579,8 +580,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;
|