proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-14 17:54:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d/p/force-gcc-header-obj.diff Fix the detection of the objc path

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-05-09 14:23:53 +02:00
commit ca9e22174a
4 changed files with 14 additions and 7 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-6.0 (1:6.0.1~+rc1-1~exp3) UNRELEASED; urgency=medium
* d/p/force-gcc-header-obj.diff Fix the detection of the objc path
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 09 May 2018 14:23:49 +0200
llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp2) experimental; urgency=medium llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp2) experimental; urgency=medium
* Add python-yaml as dep for clang-tidy (Closes: #890514) * Add python-yaml as dep for clang-tidy (Closes: #890514)

10
debian/patches/force-gcc-header-obj.diff vendored
View File

@ -1,15 +1,15 @@
Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp Index: llvm-toolchain-5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:43.433569829 +0100 --- llvm-toolchain-5.0-5.0.2~+rc1.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:45.621708435 +0100 +++ llvm-toolchain-5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
@@ -3078,6 +3078,11 @@ @@ -571,6 +571,11 @@ void Linux::AddClangSystemIncludeArgs(co
return; return;
} }
+ // Force the inclusion of the gcc headers (objc/objc.h) + // Force the inclusion of the gcc headers (objc/objc.h)
+ addExternCSystemIncludeIfExists( + addExternCSystemIncludeIfExists(
+ DriverArgs, CC1Args, GCCInstallation.getInstallPath() + "/include"); + DriverArgs, CC1Args, GCCInstallation.getInstallPath() + "/include");
+ +// std::cout << GCCInstallation.getInstallPath().str() << "/include" << std::endl;
+ +
// Lacking those, try to detect the correct set of system includes for the // Lacking those, try to detect the correct set of system includes for the
// target triple. // target triple.

2
debian/patches/series vendored
View File

@ -12,7 +12,7 @@ silent-gold-test.diff
atomic_library_1.diff atomic_library_1.diff
python-clangpath.diff python-clangpath.diff
fix-clang-path-and-build.diff fix-clang-path-and-build.diff
#force-gcc-header-obj.diff force-gcc-header-obj.diff
do-not-fail-on-unexpected-pass.diff do-not-fail-on-unexpected-pass.diff
silent-more-tests.diff silent-more-tests.diff
disable-display-PASS-UNSUPPORTED-XFAIL.diff disable-display-PASS-UNSUPPORTED-XFAIL.diff

3
debian/qualify-clang.sh vendored
View File

@ -277,7 +277,8 @@ for SYSTEM in ""; do
done done
echo "If the following fails, try setting an environment variable such as:" echo "If the following fails, try setting an environment variable such as:"
echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/include" echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/7/include"
echo "libobjc-7-dev should be also installed"
echo "#include <objc/objc.h>" > foo.m echo "#include <objc/objc.h>" > foo.m
clang-$VERSION -c foo.m clang-$VERSION -c foo.m