llvm-toolchain/debian/patches/libstdc++-header-i386.diff
Sylvestre Ledru 9e36f19118 * New snapshot release
* Merge changes from the 3.3 branch (see 1:3.3-10)
* Install libclang.so in /usr/lib/*/libclang-3.3.so
* Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
* Also ship the python clang binding (python-clang-3.3)
  (LLVM no longer mean Low Level Virtual Machine)
* Disable the build of lldb under HURD
* Ship the lldb headers into lldb-X.Y-dev (Closes: #723743)
  I might create a liblldb-X.Y library at some point but I think it is too
  early.
* Fix "cannot compile this atomic library call"
  Thanks to Francisco Facioni for the refresh (Closes: #705115)
* Install libclang.so in /usr/lib/*/libclang-3.3.so
* Install libclang.so.1 in /usr/lib/*/libclang-3.3.so.1
* Also ship the python clang binding (python-clang-3.3)
* Fix a FTBFS with a duplicate declaration of shouldUseInlineAtomic
* Update the build dependency from tcl8.5 to tcl (Closes: #725953)
2013-10-10 11:40:12 +00:00

18 lines
1020 B
Diff

Index: llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-snapshot_3.4~svn192346.orig/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:38:54.530081956 +0200
+++ llvm-toolchain-snapshot_3.4~svn192346/clang/lib/Driver/ToolChains.cpp 2013-10-10 13:38:54.522081958 +0200
@@ -2693,6 +2693,12 @@
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);
+#endif
+
if (addLibStdCXXIncludePaths(
LibDir.str() + "/../include", "/c++/" + Version.Text, TripleStr,
MultiLibSuffix + BiarchSuffix, DriverArgs, CC1Args))