proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-15 12:35:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bring back the path to libstdc++ under i386. Still not fixed upstream

Browse Source 
(Closes: #730857)
This commit is contained in:
Sylvestre Ledru 2013-11-30 15:07:54 +00:00
parent 074d151904
commit ef6d417a81
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ llvm-toolchain-3.4 (1:3.4~svn194079-1) UNRELEASED; urgency=low
See silent-MCJIIT-tests.diff See silent-MCJIIT-tests.diff
* Make lldb 3.4 also conflict with 3.5 (Closes: #730163) * Make lldb 3.4 also conflict with 3.5 (Closes: #730163)
* Make python-clang 3.4 also conflict with 3.5 (Closes: #730164) * 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 <sylvestre@debian.org> Tue, 26 Nov 2013 18:33:01 +0100 -- Sylvestre Ledru <sylvestre@debian.org> Tue, 26 Nov 2013 18:33:01 +0100

11
debian/patches/libstdc++-header-i386.diff vendored
View File

@ -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-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp 2013-11-30 15:03:35.257604848 +0000
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:46:43.636669144 +0100 +++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp 2013-11-30 15:04:14.793603425 +0000
@@ -2715,6 +2715,12 @@ @@ -2771,6 +2771,11 @@
StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix(); StringRef BiarchSuffix = GCCInstallation.getBiarchSuffix();
const GCCVersion &Version = GCCInstallation.getVersion(); const GCCVersion &Version = GCCInstallation.getVersion();
+#ifdef __i386__ +#ifdef __i386__
+ // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him + // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him
+// 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);
+// addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args);
+#endif +#endif
+ +
if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", if (addLibStdCXXIncludePaths(LibDir.str() + "/../include",