llvm-toolchain/debian/patches/include-target.diff
Sylvestre Ledru 958e83f5c7 * Remove the usage of --with-c-include-dirs, --with-cxx-include-root,
--with-cxx-include-arch and --with-cxx-include-64bit-dir
  It was blocking the automatic detection of the path of clang.
  In particular in the context of the usage of -target.
  However, it does not completely fix the detection of the i386 C++ path.
  See the next item.
  (Closes: #729933)
* Bring back the path to libstdc++ under i386. Still not fixed upstream
  (Closes: #730857)
2013-12-01 17:02:02 +00:00

14 lines
829 B
Diff

Index: llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp
===================================================================
--- llvm-toolchain-3.4-3.4~+rc1.orig/clang/lib/Driver/ToolChains.cpp 2013-12-01 16:44:29.334277797 +0000
+++ llvm-toolchain-3.4-3.4~+rc1/clang/lib/Driver/ToolChains.cpp 2013-12-01 16:44:29.294277798 +0000
@@ -2773,7 +2773,7 @@
#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);
+ addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.Text, "i386-linux-gnu", BiarchSuffix, MIPSABIDirSuffix, DriverArgs, CC1Args);
#endif
if (addLibStdCXXIncludePaths(LibDir.str() + "/../include",