* Fix 'bits/c++config.h' file not found under i386

See libstdc++-header-i386.diff. (Closes: #714890)
* Add more fixes for the HURD port... (but still fails)
This commit is contained in:
Sylvestre Ledru 2013-09-04 14:20:10 +00:00
parent 78a5add820
commit 36df6cff64
3 changed files with 19 additions and 2 deletions

4
debian/changelog vendored
View File

@ -7,7 +7,9 @@ llvm-toolchain-3.3 (1:3.3-9) UNRELEASED; urgency=low
[ Sylvestre Ledru ]
* Only use -fuse-ld=gold on supported distribution. Simplify the
backports.
* Add more fixes for the HURD port...
* Fix 'bits/c++config.h' file not found under i386
See libstdc++-header-i386.diff. (Closes: #714890)
* Add more fixes for the HURD port... (but still fails)
[ Jon Severinsson ]
* Merge from llvm-toolchain-3.2 branch up to 3.2repack-11.

View File

@ -0,0 +1,15 @@
Index: llvm-toolchain-3.3-3.3/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.3-3.3.orig/clang/lib/Driver/ToolChains.cpp 2013-09-03 14:04:41.000000000 +0000
+++ llvm-toolchain-3.3-3.3/clang/lib/Driver/ToolChains.cpp 2013-09-04 14:09:12.000000000 +0000
@@ -2588,6 +2588,10 @@
StringRef Version = GCCInstallation.getVersion().Text;
StringRef TripleStr = GCCInstallation.getTriple().str();
+ #ifdef __i386__
+ // 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",
"/c++/" + Version.str(),
TripleStr,

View File

@ -33,4 +33,4 @@ unwind-chain-inclusion.diff
hurd-pathmax.diff
libprofile_rt_sparc.patch
lldb-hurd.diff
lldb-link-atomic.diff
libstdc++-header-i386.diff