proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-15 05:29:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* New snapshot release

Browse Source 
* Update the search path for clang from /usr/include/clang/VERSION/include/
  to /usr/bin/../include/clang/VERSION/include/
  To make sure we avoid mixing the headers from the build and installed on
  the system.
This commit is contained in:
Sylvestre Ledru 2013-11-07 15:51:53 +00:00
parent bf68d6426b
commit ecbcb75034
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/changelog vendored
View File

@ -1,4 +1,14 @@
llvm-toolchain-snapshot (1:3.4~svn193983-1) unstable; urgency=low llvm-toolchain-snapshot (1:3.4~svn194200-1~exp1) experimental; urgency=low
* New snapshot release
* Update the search path for clang from /usr/include/clang/VERSION/include/
to /usr/bin/../include/clang/VERSION/include/
To make sure we avoid mixing the headers from the build and installed on
the system.
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 07 Nov 2013 12:33:12 +0100
llvm-toolchain-snapshot (1:3.4~svn194079-1) unstable; urgency=low
* New snapshot release * New snapshot release
* Also install clang 3.4 examples (clang-3.4-examples) (Closes: #728260) * Also install clang 3.4 examples (clang-3.4-examples) (Closes: #728260)

15
debian/patches/21-searchPathHeaders.diff vendored
View File

@ -1,15 +1,16 @@
Index: llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp Index: llvm-toolchain-snapshot_3.4~svn194200/clang/lib/Driver/ToolChains.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.4~svn193982.orig/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.468669903 +0100 --- llvm-toolchain-snapshot_3.4~svn194200.orig/clang/lib/Driver/ToolChains.cpp 2013-11-07 12:39:24.226486698 +0100
+++ llvm-toolchain-snapshot_3.4~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.464669903 +0100 +++ llvm-toolchain-snapshot_3.4~svn194200/clang/lib/Driver/ToolChains.cpp 2013-11-07 16:28:42.710987790 +0100
@@ -2529,6 +2529,11 @@ @@ -2531,6 +2531,12 @@
addSystemInclude(DriverArgs, CC1Args, P.str()); addSystemInclude(DriverArgs, CC1Args, P.str());
} }
+ // Under Debian, clang headers are installed into + // Under Debian, clang headers are installed into
+ // '/usr/include/clang/VERSION/include/' + // '/usr/bin/../include/clang/VERSION/include/'
+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); + // This avoid some mix up at build time with the local and system headers
+ + addSystemInclude(DriverArgs, CC1Args, std::string(D.InstalledDir) + "/../include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
+
+ +
if (DriverArgs.hasArg(options::OPT_nostdlibinc)) if (DriverArgs.hasArg(options::OPT_nostdlibinc))
return; return;