proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-09 10:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Many thanks to Jason Rhinelander for investigating
This commit is contained in:
Sylvestre Ledru 2017-02-18 16:56:49 +00:00
parent b793707858
commit c2e0bf0f41
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
llvm-toolchain-4.0 (1:4.0~+rc2-2) UNRELEASED; urgency=medium
* Fix the C++ include path order (Closes: #855222)
Many thanks to Jason Rhinelander for investigating
-- Sylvestre Ledru <sylvestre@debian.org> Sat, 18 Feb 2017 17:54:01 +0100
llvm-toolchain-4.0 (1:4.0~+rc2-1) unstable; urgency=medium llvm-toolchain-4.0 (1:4.0~+rc2-1) unstable; urgency=medium
* New testing release * New testing release

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

@ -2,14 +2,15 @@
clang/lib/Driver/ToolChains.cpp | 2 ++ clang/lib/Driver/ToolChains.cpp | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
--- a/clang/lib/Driver/ToolChains.cpp Index: llvm-toolchain-4.0-4.0~+rc2/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp ===================================================================
@@ -2842,6 +2842,8 @@ void Generic_GCC::AddClangCXXStdlibInclu --- llvm-toolchain-4.0-4.0~+rc2.orig/clang/lib/Driver/ToolChains.cpp
DriverArgs.hasArg(options::OPT_nostdincxx)) +++ llvm-toolchain-4.0-4.0~+rc2/clang/lib/Driver/ToolChains.cpp
return; @@ -2952,6 +2952,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
addLibStdCxxIncludePaths(DriverArgs, CC1Args);
break;
}
+ 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();