proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-04 01:26:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the C++ include path order (Closes: #859083)

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-08-25 07:01:02 +00:00
parent bf1562ff6c
commit fdd3b83932
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
llvm-toolchain-5.0 (1:5.0~+rc2-2) unstable; urgency=medium llvm-toolchain-5.0 (1:5.0~+rc2-2) unstable; urgency=medium
* Link LLDB with -latomic on powerpcspe (Closes: #872267) * Link LLDB with -latomic on powerpcspe (Closes: #872267)
* Fix the C++ include path order (Closes: #859083)
* Take an ugly workaround to build with gcc 7 * Take an ugly workaround to build with gcc 7
See https://bugs.llvm.org/show_bug.cgi?id=34140 See https://bugs.llvm.org/show_bug.cgi?id=34140

29
debian/patches/fix-clang-path-and-build.diff vendored
View File

@ -2,24 +2,15 @@
clang/lib/Driver/ToolChains.cpp | 2 ++ clang/lib/Driver/ToolChains.cpp | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Gnu.cpp Index: llvm-toolchain-4.0-4.0~+rc2/clang/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Gnu.cpp --- llvm-toolchain-4.0-4.0~+rc2.orig/clang/lib/Driver/ToolChains.cpp
+++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Gnu.cpp +++ llvm-toolchain-4.0-4.0~+rc2/clang/lib/Driver/ToolChains.cpp
@@ -15,6 +15,7 @@ @@ -2952,6 +2952,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
#include "Arch/SystemZ.h" addLibStdCxxIncludePaths(DriverArgs, CC1Args);
#include "CommonArgs.h" break;
#include "clang/Basic/VirtualFileSystem.h" }
+#include "clang/Basic/Version.h"
#include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
#include "clang/Driver/Compilation.h"
#include "clang/Driver/Driver.h"
@@ -2306,6 +2307,8 @@ void Generic_GCC::AddClangCXXStdlibInclu
DriverArgs.hasArg(options::OPT_nostdincxx))
return;
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); + addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+ }
switch (GetCXXStdlibType(DriverArgs)) {
case ToolChain::CST_Libcxx: { std::string Generic_GCC::findLibCxxIncludePath() const {
std::string Path = findLibCxxIncludePath();