Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
llvm-toolchain
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
pkg-llvm
llvm-toolchain
Commits
ca9e2217
Commit
ca9e2217
authored
May 09, 2018
by
Sylvestre Ledru
Browse files
Options
Browse Files
Download
Plain Diff
d/p/force-gcc-header-obj.diff Fix the detection of the objc path
parents
2ba9959b
9484e7ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
7 deletions
+14
-7
changelog
debian/changelog
+6
-0
force-gcc-header-obj.diff
debian/patches/force-gcc-header-obj.diff
+5
-5
series
debian/patches/series
+1
-1
qualify-clang.sh
debian/qualify-clang.sh
+2
-1
No files found.
debian/changelog
View file @
ca9e2217
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
*
Add
python
-
yaml
as
dep
for
clang
-
tidy
(
Closes
:
#
890514
)
...
...
debian/patches/force-gcc-header-obj.diff
View file @
ca9e2217
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-
snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp 2014-02-19 09:46:45.621708435 +0100
@@ -
3078,6 +3078,11 @@
--- llvm-toolchain-
5.0-5.0.2~+rc1.orig/clang/lib/Driver/ToolChains/Linux.cpp
+++ llvm-toolchain-
5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
@@ -
571,6 +571,11 @@ void Linux::AddClangSystemIncludeArgs(co
return;
}
+ // Force the inclusion of the gcc headers (objc/objc.h)
+ addExternCSystemIncludeIfExists(
+ 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
// target triple.
...
...
debian/patches/series
View file @
ca9e2217
...
...
@@ -12,7 +12,7 @@ silent-gold-test.diff
atomic_library_1.diff
python-clangpath.diff
fix-clang-path-and-build.diff
#
force-gcc-header-obj.diff
force-gcc-header-obj.diff
do-not-fail-on-unexpected-pass.diff
silent-more-tests.diff
disable-display-PASS-UNSUPPORTED-XFAIL.diff
...
...
debian/qualify-clang.sh
View file @
ca9e2217
...
...
@@ -277,7 +277,8 @@ for SYSTEM in ""; do
done
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
clang-
$VERSION
-c
foo.m
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment