From ef6d417a818a37e10dc7ac8dd1b92c7229a6638a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 30 Nov 2013 15:07:54 +0000 Subject: [PATCH] Bring back the path to libstdc++ under i386. Still not fixed upstream (Closes: #730857) --- debian/changelog | 4 +++- debian/patches/libstdc++-header-i386.diff | 13 ++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 691b60a4..79164173 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,10 +3,12 @@ llvm-toolchain-3.4 (1:3.4~svn194079-1) UNRELEASED; urgency=low * Define also MAXPATHLEN in Path.inc for HURD. * Silent the trillion of warnings in the LLDB Python wrapper (swig generated) See silent-swig-warning.diff - * Silent some i386 tests failing (it is expected) + * Silent some i386 tests failing (it is expected) See silent-MCJIIT-tests.diff * Make lldb 3.4 also conflict with 3.5 (Closes: #730163) * Make python-clang 3.4 also conflict with 3.5 (Closes: #730164) + * Bring back the path to libstdc++ under i386. Still not fixed upstream + (Closes: #730857) -- Sylvestre Ledru Tue, 26 Nov 2013 18:33:01 +0100 diff --git a/debian/patches/libstdc++-header-i386.diff b/debian/patches/libstdc++-header-i386.diff index 53e81e6e..5ff40ee5 100644 --- a/debian/patches/libstdc++-header-i386.diff +++ b/debian/patches/libstdc++-header-i386.diff @@ -1,15 +1,14 @@ -Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp +Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp =================================================================== ---- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:46:43.636669144 +0100 -+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:46:43.636669144 +0100 -@@ -2715,6 +2715,12 @@ +--- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp 2013-11-30 15:03:35.257604848 +0000 ++++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp 2013-11-30 15:04:14.793603425 +0000 +@@ -2771,6 +2771,11 @@ StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix(); const GCCVersion &Version = GCCInstallation.getVersion(); +#ifdef __i386__ -+ // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Helphim -+// For now, comment this patch to make sure it is fixed upstream -+// addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args); ++ // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him ++ addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args); +#endif + if (addLibStdCXXIncludePaths(LibDir.str() + "/../include",