From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Fri, 4 Nov 2016 00:33:12 +0000 (+0000)
Subject: fix-clang-path-and-build
X-Git-Tag: archive/raspbian/1%3.8.1-17+rpi1~36
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=40ce7f1e7012b27d2c0ee28f69c560545c46c9be;p=llvm-toolchain-3.8.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 99c7b8e6..ddf23815 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -3019,6 +3019,8 @@ void Bitrig::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,