From ecbcb75034bc7977fd0acf099fa26f5aca499c6c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 7 Nov 2013 15:51:53 +0000 Subject: [PATCH] * 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. --- debian/changelog | 12 +++++++++++- debian/patches/21-searchPathHeaders.diff | 15 ++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 307add01..4cf05ea8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 07 Nov 2013 12:33:12 +0100 + +llvm-toolchain-snapshot (1:3.4~svn194079-1) unstable; urgency=low * New snapshot release * Also install clang 3.4 examples (clang-3.4-examples) (Closes: #728260) diff --git a/debian/patches/21-searchPathHeaders.diff b/debian/patches/21-searchPathHeaders.diff index b005d756..32b9e5d9 100644 --- a/debian/patches/21-searchPathHeaders.diff +++ b/debian/patches/21-searchPathHeaders.diff @@ -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~svn193982/clang/lib/Driver/ToolChains.cpp 2013-11-04 09:47:04.464669903 +0100 -@@ -2529,6 +2529,11 @@ +--- 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~svn194200/clang/lib/Driver/ToolChains.cpp 2013-11-07 16:28:42.710987790 +0100 +@@ -2531,6 +2531,12 @@ addSystemInclude(DriverArgs, CC1Args, P.str()); } + // Under Debian, clang headers are installed into -+ // '/usr/include/clang/VERSION/include/' -+ addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/"); -+ ++ // '/usr/bin/../include/clang/VERSION/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)) return;