From edf1e5d0abd8bdd93a7901ec1c0221652d449750 Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Wed, 7 Aug 2019 14:11:36 +0100 Subject: [PATCH] fix-clang-path-and-build Gbp-Pq: Name fix-clang-path-and-build.diff --- clang/lib/Driver/ToolChains/Gnu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 2ad45097d..a38cd4919 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -1,4 +1,5 @@ -//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ -*-===// +//===--- Gnu.cpp - Gnu Tool and ToolChain Implementations -------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -16,6 +17,7 @@ #include "Arch/SystemZ.h" #include "CommonArgs.h" #include "Linux.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" @@ -2535,6 +2537,7 @@ void Generic_GCC::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, addLibStdCxxIncludePaths(DriverArgs, CC1Args); break; } + addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); } void -- 2.30.2