From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 12 Mar 2017 09:01:10 +0000 (+0000)
Subject: fix-clang-path-and-build
X-Git-Tag: archive/raspbian/1%4.0.1-1+rpi1~3^2~2^2^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=432ee21ff68478bb5e5d0f32daef9061ee6f087c;p=llvm-toolchain-4.0.git

fix-clang-path-and-build

===================================================================

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

diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 1b02f467c..7844e7b41 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -3322,6 +3322,8 @@ void Haiku::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
       DriverArgs.hasArg(options::OPT_nostdincxx))
     return;
 
+  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+
   switch (GetCXXStdlibType(DriverArgs)) {
   case ToolChain::CST_Libcxx:
     addSystemInclude(DriverArgs, CC1Args,