From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Wed, 27 Jun 2018 14:24:20 +0000 (+0100)
Subject: fix-clang-path-and-build
X-Git-Tag: archive/raspbian/1%6.0.1-2+rpi1^2~38
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c09d29cdf043e8d3389e02b7f170a332ca68c74a;p=llvm-toolchain-6.0.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 7845781f..cbce3f11 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -16,6 +16,7 @@
 #include "Arch/SystemZ.h"
 #include "CommonArgs.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"
@@ -2276,6 +2277,7 @@ void Generic_GCC::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
     addLibStdCxxIncludePaths(DriverArgs, CC1Args);
     break;
   }
+  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
 }
 
 std::string Generic_GCC::findLibCxxIncludePath() const {