From 6fb10d096548993ac6d8ee97fc4a8321e406036c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 11 Apr 2018 12:07:00 +0200 Subject: [PATCH] rebase of the patch --- debian/patches/fix-clang-path-and-build.diff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff index ac0399d6..37d6afbd 100644 --- a/debian/patches/fix-clang-path-and-build.diff +++ b/debian/patches/fix-clang-path-and-build.diff @@ -2,10 +2,10 @@ clang/lib/Driver/ToolChains.cpp | 2 ++ 1 file changed, 2 insertions(+) -Index: llvm-toolchain-snapshot_7~svn322673/clang/lib/Driver/ToolChains/Gnu.cpp +Index: llvm-toolchain-snapshot_7~svn329789/clang/lib/Driver/ToolChains/Gnu.cpp =================================================================== ---- llvm-toolchain-snapshot_7~svn322673.orig/clang/lib/Driver/ToolChains/Gnu.cpp -+++ llvm-toolchain-snapshot_7~svn322673/clang/lib/Driver/ToolChains/Gnu.cpp +--- llvm-toolchain-snapshot_7~svn329789.orig/clang/lib/Driver/ToolChains/Gnu.cpp ++++ llvm-toolchain-snapshot_7~svn329789/clang/lib/Driver/ToolChains/Gnu.cpp @@ -17,6 +17,7 @@ #include "CommonArgs.h" #include "Linux.h" @@ -14,11 +14,11 @@ Index: llvm-toolchain-snapshot_7~svn322673/clang/lib/Driver/ToolChains/Gnu.cpp #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX #include "clang/Driver/Compilation.h" #include "clang/Driver/Driver.h" -@@ -2334,6 +2335,7 @@ void Generic_GCC::AddClangCXXStdlibInclu +@@ -2399,6 +2400,7 @@ void Generic_GCC::AddClangCXXStdlibInclu addLibStdCxxIncludePaths(DriverArgs, CC1Args); break; } + addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); } - std::string Generic_GCC::findLibCxxIncludePath() const { + void