From d96c219c683a25f3b16b14ffe0e24569f489f384 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sat, 12 Aug 2017 10:38:36 +0100 Subject: [PATCH] fix-clang-path-and-build Gbp-Pq: Name fix-clang-path-and-build.diff --- clang/lib/Driver/ToolChains/Gnu.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 72a9f85ba..d8721bc2e 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -15,6 +15,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" @@ -2356,6 +2357,8 @@ void Generic_GCC::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: { std::string Path = findLibCxxIncludePath(); -- 2.30.2