From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Wed, 17 Oct 2018 09:00:09 +0000 (+0100)
Subject: fix-clang-path-and-build
X-Git-Tag: archive/raspbian/1%7-6+rpi1~55
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9ab9264cc873605eabc25de2644b567b87946fba;p=llvm-toolchain-7.git

fix-clang-path-and-build


Gbp-Pq: Name fix-clang-path-and-build.diff
---

diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index 375567325..47e4f9a5a 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -17,6 +17,7 @@
 #include "CommonArgs.h"
 #include "Linux.h"
 #include "clang/Basic/VirtualFileSystem.h"
+#include "clang/Basic/Version.h"
 #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
 #include "clang/Driver/Compilation.h"
 #include "clang/Driver/Driver.h"
@@ -2444,6 +2445,7 @@ void Generic_GCC::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
     addLibStdCxxIncludePaths(DriverArgs, CC1Args);
     break;
   }
+  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
 }
 
 void