From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 18 Jun 2017 17:12:15 +0000 (+0100)
Subject: fix-clang-path-and-build
X-Git-Tag: archive/raspbian/1%3.9.1-10+rpi1^2~37
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0a78580a30a9efba16d79cbb637cefa3123c78e4;p=llvm-toolchain-3.9.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 1b02f467..7844e7b4 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,