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

rebase of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2019-09-02 12:07:58 +02:00
parent 5856ba19dd
commit 8d40ce03b1
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-snapshot (1:10~svn370632-1~exp1) experimental; urgency=medium
* New snapshot release
-- Sylvestre Ledru <sylvestre@debian.org> Mon, 02 Sep 2019 11:30:08 +0200
llvm-toolchain-snapshot (1:10~svn370407-1~exp1) experimental; urgency=medium
* New snapshot release

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

@ -1,7 +1,7 @@
Index: llvm-toolchain-9-9~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
Index: llvm-toolchain-snapshot_10~svn370632/clang/lib/Driver/ToolChains/Linux.cpp
===================================================================
--- llvm-toolchain-9-9~+rc3.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-9-9~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
--- llvm-toolchain-snapshot_10~svn370632.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_10~svn370632/clang/lib/Driver/ToolChains/Linux.cpp
@@ -12,6 +12,7 @@
#include "Arch/PPC.h"
#include "Arch/RISCV.h"
@ -10,21 +10,24 @@ Index: llvm-toolchain-9-9~+rc3/clang/lib/Driver/ToolChains/Linux.cpp
#include "clang/Config/config.h"
#include "clang/Driver/Distro.h"
#include "clang/Driver/Driver.h"
@@ -665,7 +666,16 @@ void Linux::AddClangSystemIncludeArgs(co
if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
SmallString<128> P(D.ResourceDir);
llvm::sys::path::append(P, "include");
- addSystemInclude(DriverArgs, CC1Args, P);
+ if (llvm::sys::fs::exists(P)) {
+ /* Include the build include directory only
+ * Otherwise, it fails with stage2 when clang headers are available on the system
+ * they usually fail because of the include_next. Two llvm/clang headers are found
+ * while we are waiting for the lib C++ (std or not)
+ */
+ addSystemInclude(DriverArgs, CC1Args, P);
+ } else {
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+ }
}
@@ -661,8 +662,18 @@ void Linux::AddClangSystemIncludeArgs(co
SmallString<128> ResourceDirInclude(D.ResourceDir);
llvm::sys::path::append(ResourceDirInclude, "include");
if (!DriverArgs.hasArg(options::OPT_nobuiltininc) &&
- (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc)))
- addSystemInclude(DriverArgs, CC1Args, ResourceDirInclude);
+ (!getTriple().isMusl() || DriverArgs.hasArg(options::OPT_nostdlibinc))) {
+ if (llvm::sys::fs::exists(P)) {
+ /* Include the build include directory only
+ * Otherwise, it fails with stage2 when clang headers are available on the system
+ * they usually fail because of the include_next. Two llvm/clang headers are found
+ * while we are waiting for the lib C++ (std or not)
+ */
+ addSystemInclude(DriverArgs, CC1Args, P);
+ } else {
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+ }
+ }
if (DriverArgs.hasArg(options::OPT_nostdlibinc))
return;