fix variable

This commit is contained in:
Sylvestre Ledru 2019-09-03 10:25:52 +02:00
parent 78dca62326
commit 75cfc021fd

View File

@ -17,13 +17,13 @@ Index: llvm-toolchain-snapshot_10~svn370632/clang/lib/Driver/ToolChains/Linux.cp
- (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
- addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc))) {
+ if (llvm::sys::fs::exists(P)) {
+ 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, P);
+ addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ } else {
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+ }