1 |
commit: f1a321bfd7c8e0dd965398490e6ccfd357c4a4db |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 22 11:13:11 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 22 11:21:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a321bf |
7 |
|
8 |
sys-libs/compiler-rt-sanitizers: Switch to patchsets |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-libs/compiler-rt-sanitizers/Manifest | 5 ++ |
13 |
.../compiler-rt-sanitizers-10.0.1.ebuild | 1 + |
14 |
.../compiler-rt-sanitizers-11.0.0.ebuild | 5 +- |
15 |
.../compiler-rt-sanitizers-11.0.1.ebuild | 5 +- |
16 |
.../compiler-rt-sanitizers-11.1.0.ebuild | 5 +- |
17 |
.../compiler-rt-sanitizers-12.0.0.9999.ebuild | 5 +- |
18 |
.../compiler-rt-sanitizers-12.0.0.ebuild | 5 +- |
19 |
.../compiler-rt-sanitizers-13.0.0.9999.ebuild | 5 +- |
20 |
.../files/11.1.0/compiler-rt-prefix-paths.patch | 79 ---------------------- |
21 |
.../files/9999/compiler-rt-prefix-paths.patch | 66 ------------------ |
22 |
10 files changed, 12 insertions(+), 169 deletions(-) |
23 |
|
24 |
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest |
25 |
index 09cfebc2769..88b3c48b1f1 100644 |
26 |
--- a/sys-libs/compiler-rt-sanitizers/Manifest |
27 |
+++ b/sys-libs/compiler-rt-sanitizers/Manifest |
28 |
@@ -1,3 +1,8 @@ |
29 |
+DIST llvm-gentoo-patchset-10.0.1-1.tar.xz 8320 BLAKE2B 1b7ea7669586e08fece0efcf02b392feed4b7f3e6e9cdd10ab7dcc30082cae5bb1daa6d3314a7b0329c4d70f3c736d0c57ed408c838601dc737d558d2a0a0f26 SHA512 75898a8d719657177bbf587d848be8e53135c09e50603660c19edab00f80b6c2f29e7b6fda2bef381b38df6e24a690d694029a38c525763408322573275fc9f0 |
30 |
+DIST llvm-gentoo-patchset-11.0.0-1.tar.xz 6100 BLAKE2B 6f8fc9b7daa703f04b1283caaeb3665d4bec56ff80b1c5db35917c578fdd92617222bd2d2b83020144b8abdeaa261142b68aa3dee24350133f6721e41a167b78 SHA512 debdd92e6aa3133f474dfbd79f267e76d9d979e4e5d464c8d4343c6e6816b46376ca8080a9ee916152861907af9d0645ce71cf3582ef3dc31ec4ca3410fde9f6 |
31 |
+DIST llvm-gentoo-patchset-11.1.0-1.tar.xz 4032 BLAKE2B e69138a422e315b31a3d9c11faa4ae1ddf1bf9092cee2db0de4d2adef81fd802973488293aab48b764402b51996893b17ca03249ef4620848a576d1f6cdb9698 SHA512 e1c5504dab6c5db9fdf4addfeb12316f22d0258717ba551a9b7b3ba37919491fb6011ac5cca1e793b7509d5c1c186bc6bc4213f7d6155d190612492b216f979b |
32 |
+DIST llvm-gentoo-patchset-12.0.0-1.tar.xz 6364 BLAKE2B bcf96dad8300cdc3e1f416cb90935ae3b1359efc5687118b5a9bbee25de7087a266250f50c6f2abd18f4efeeec19354f59513c8fdd1d61c2cfc8cc2f0115e514 SHA512 76201e169f71a8d568365ffeafcfd37138e74b0536826f47eb6ce89c2280586f10426917e851f99bfb20477cd828cc40daa8cb7a62959981620fbd81e1b22ee1 |
33 |
+DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc |
34 |
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 |
35 |
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2 |
36 |
DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf |
37 |
|
38 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild |
39 |
index 1107b97186c..d98f454c949 100644 |
40 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild |
41 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1.ebuild |
42 |
@@ -10,6 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
43 |
HOMEPAGE="https://llvm.org/" |
44 |
LLVM_COMPONENTS=( compiler-rt ) |
45 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
46 |
+LLVM_PATCHSET=10.0.1-1 |
47 |
llvm.org_set_globals |
48 |
|
49 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
50 |
|
51 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild |
52 |
index adfe23a46b4..76ddc20cdc7 100644 |
53 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild |
54 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.ebuild |
55 |
@@ -10,6 +10,7 @@ DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
56 |
HOMEPAGE="https://llvm.org/" |
57 |
LLVM_COMPONENTS=( compiler-rt ) |
58 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
59 |
+LLVM_PATCHSET=11.0.0-1 |
60 |
llvm.org_set_globals |
61 |
|
62 |
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
63 |
@@ -35,10 +36,6 @@ BDEPEND=" |
64 |
sys-libs/compiler-rt:${SLOT} ) |
65 |
${PYTHON_DEPS}" |
66 |
|
67 |
-PATCHES=( |
68 |
- "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
69 |
-) |
70 |
- |
71 |
python_check_deps() { |
72 |
use test || return 0 |
73 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
74 |
|
75 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild |
76 |
index d139a2006ac..288939d8f17 100644 |
77 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild |
78 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.1.ebuild |
79 |
@@ -48,12 +48,9 @@ BDEPEND=" |
80 |
|
81 |
LLVM_COMPONENTS=( compiler-rt ) |
82 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
83 |
+LLVM_PATCHSET=11.1.0-1 |
84 |
llvm.org_set_globals |
85 |
|
86 |
-PATCHES=( |
87 |
- "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
88 |
-) |
89 |
- |
90 |
python_check_deps() { |
91 |
use test || return 0 |
92 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
93 |
|
94 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild |
95 |
index d139a2006ac..288939d8f17 100644 |
96 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild |
97 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.1.0.ebuild |
98 |
@@ -48,12 +48,9 @@ BDEPEND=" |
99 |
|
100 |
LLVM_COMPONENTS=( compiler-rt ) |
101 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
102 |
+LLVM_PATCHSET=11.1.0-1 |
103 |
llvm.org_set_globals |
104 |
|
105 |
-PATCHES=( |
106 |
- "${FILESDIR}/11.1.0/compiler-rt-prefix-paths.patch" |
107 |
-) |
108 |
- |
109 |
python_check_deps() { |
110 |
use test || return 0 |
111 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
112 |
|
113 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild |
114 |
index b9f483144cd..e96a0217228 100644 |
115 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild |
116 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild |
117 |
@@ -48,12 +48,9 @@ BDEPEND=" |
118 |
|
119 |
LLVM_COMPONENTS=( compiler-rt ) |
120 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
121 |
+LLVM_PATCHSET=9999-1 |
122 |
llvm.org_set_globals |
123 |
|
124 |
-PATCHES=( |
125 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
126 |
-) |
127 |
- |
128 |
python_check_deps() { |
129 |
use test || return 0 |
130 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
131 |
|
132 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.ebuild |
133 |
index abbff240250..63517d145db 100644 |
134 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.ebuild |
135 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.ebuild |
136 |
@@ -50,12 +50,9 @@ BDEPEND=" |
137 |
|
138 |
LLVM_COMPONENTS=( compiler-rt ) |
139 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
140 |
+LLVM_PATCHSET=12.0.0-1 |
141 |
llvm.org_set_globals |
142 |
|
143 |
-PATCHES=( |
144 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
145 |
-) |
146 |
- |
147 |
python_check_deps() { |
148 |
use test || return 0 |
149 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
150 |
|
151 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild |
152 |
index b9f483144cd..e96a0217228 100644 |
153 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild |
154 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.9999.ebuild |
155 |
@@ -48,12 +48,9 @@ BDEPEND=" |
156 |
|
157 |
LLVM_COMPONENTS=( compiler-rt ) |
158 |
LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) |
159 |
+LLVM_PATCHSET=9999-1 |
160 |
llvm.org_set_globals |
161 |
|
162 |
-PATCHES=( |
163 |
- "${FILESDIR}/9999/compiler-rt-prefix-paths.patch" |
164 |
-) |
165 |
- |
166 |
python_check_deps() { |
167 |
use test || return 0 |
168 |
has_version "dev-python/lit[${PYTHON_USEDEP}]" |
169 |
|
170 |
diff --git a/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch |
171 |
deleted file mode 100644 |
172 |
index c27e3c44f68..00000000000 |
173 |
--- a/sys-libs/compiler-rt-sanitizers/files/11.1.0/compiler-rt-prefix-paths.patch |
174 |
+++ /dev/null |
175 |
@@ -1,79 +0,0 @@ |
176 |
---- a/compiler-rt/cmake/config-ix.cmake 2020-10-07 05:10:48.000000000 -0500 |
177 |
-+++ b/compiler-rt/cmake/config-ix.cmake 2020-12-13 16:17:43.000000000 -0600 |
178 |
-@@ -424,10 +424,7 @@ |
179 |
- ${DARWIN_COMMON_LINK_FLAGS} |
180 |
- ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION}) |
181 |
- |
182 |
-- if(DARWIN_osx_SYSROOT) |
183 |
-- list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT}) |
184 |
-- list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT}) |
185 |
-- endif() |
186 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
187 |
- |
188 |
- # Figure out which arches to use for each OS |
189 |
- darwin_get_toolchain_supported_archs(toolchain_arches) |
190 |
---- a/compiler-rt/cmake/base-config-ix.cmake 2020-12-13 16:17:13.000000000 -0600 |
191 |
-+++ b/compiler-rt/cmake/base-config-ix.cmake 2020-12-13 16:18:59.000000000 -0600 |
192 |
-@@ -102,23 +102,8 @@ |
193 |
- endif() |
194 |
- |
195 |
- if(APPLE) |
196 |
-- # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but |
197 |
-- # not the command line tools (or is using macOS 10.14 or newer). If this is |
198 |
-- # the case, we need to find the OS X sysroot to pass to clang. |
199 |
-- if(NOT EXISTS /usr/include/c++) |
200 |
-- execute_process(COMMAND xcrun -sdk macosx --show-sdk-path |
201 |
-- OUTPUT_VARIABLE OSX_SYSROOT |
202 |
-- ERROR_QUIET |
203 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE) |
204 |
-- if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT}) |
205 |
-- message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist") |
206 |
-- else() |
207 |
-- message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}") |
208 |
-- set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}") |
209 |
-- endif() |
210 |
-- else() |
211 |
-- set(OSX_SYSROOT_FLAG "") |
212 |
-- endif() |
213 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
214 |
-+ set(OSX_SYSROOT_FLAG "") |
215 |
- |
216 |
- option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On) |
217 |
- option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off) |
218 |
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-10-07 05:10:48.000000000 -0500 |
219 |
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-12-13 16:21:32.000000000 -0600 |
220 |
-@@ -273,7 +273,8 @@ |
221 |
- ${ARGN}) |
222 |
- set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}") |
223 |
- add_library(${libname} STATIC ${LIB_SOURCES}) |
224 |
-- if(DARWIN_${LIB_OS}_SYSROOT) |
225 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
226 |
-+ if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx") |
227 |
- set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT}) |
228 |
- endif() |
229 |
- |
230 |
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2020-10-07 05:10:48.000000000 -0500 |
231 |
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2020-12-13 18:12:27.000000000 -0600 |
232 |
-@@ -277,9 +277,10 @@ |
233 |
- if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) |
234 |
- list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}") |
235 |
- endif() |
236 |
-+ # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake) |
237 |
-- if(CMAKE_SYSROOT) |
238 |
-+ if(CMAKE_SYSROOT AND NOT APPLE) |
239 |
- list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}") |
240 |
- endif() |
241 |
- string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}") |
242 |
- string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions |
243 |
- ${CMAKE_C_COMPILE_OBJECT}) |
244 |
---- a/compiler-rt/lib/tsan/CMakeLists.txt 2020-12-13 19:42:02.000000000 -0600 |
245 |
-+++ b/compiler-rt/lib/tsan/CMakeLists.txt 2020-12-13 19:42:38.000000000 -0600 |
246 |
-@@ -244,6 +244,7 @@ |
247 |
- # and Clang's versions. As a workaround do not use --sysroot=. on FreeBSD/NetBSD |
248 |
- # until this is addressed. |
249 |
- if(COMPILER_RT_HAS_SYSROOT_FLAG AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" |
250 |
-+ AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" |
251 |
- AND NOT CMAKE_SYSTEM_NAME MATCHES "NetBSD") |
252 |
- file(GLOB _tsan_generic_sources rtl/tsan*) |
253 |
- file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac* |
254 |
- |
255 |
|
256 |
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch b/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch |
257 |
deleted file mode 100644 |
258 |
index 0f1bbb86326..00000000000 |
259 |
--- a/sys-libs/compiler-rt-sanitizers/files/9999/compiler-rt-prefix-paths.patch |
260 |
+++ /dev/null |
261 |
@@ -1,66 +0,0 @@ |
262 |
---- a/compiler-rt/cmake/config-ix.cmake.ORIG 2021-01-29 09:54:20.880593534 +0100 |
263 |
-+++ b/compiler-rt/cmake/config-ix.cmake 2021-01-29 09:58:49.595603555 +0100 |
264 |
-@@ -444,10 +444,7 @@ |
265 |
- ${DARWIN_COMMON_LINK_FLAGS} |
266 |
- ${DARWIN_osx_MIN_VER_FLAG}=${SANITIZER_MIN_OSX_VERSION}) |
267 |
- |
268 |
-- if(DARWIN_osx_SYSROOT) |
269 |
-- list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT}) |
270 |
-- list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT}) |
271 |
-- endif() |
272 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
273 |
- |
274 |
- # Figure out which arches to use for each OS |
275 |
- darwin_get_toolchain_supported_archs(toolchain_arches) |
276 |
---- a/compiler-rt/cmake/base-config-ix.cmakeORIG 2021-01-29 09:54:20.880593534 +0100 |
277 |
-+++ b/compiler-rt/cmake/base-config-ix.cmake 2021-01-29 09:59:41.087605475 +0100 |
278 |
-@@ -101,23 +101,8 @@ |
279 |
- endif() |
280 |
- |
281 |
- if(APPLE) |
282 |
-- # On Darwin if /usr/include/c++ doesn't exist, the user probably has Xcode but |
283 |
-- # not the command line tools (or is using macOS 10.14 or newer). If this is |
284 |
-- # the case, we need to find the OS X sysroot to pass to clang. |
285 |
-- if(NOT EXISTS /usr/include/c++) |
286 |
-- execute_process(COMMAND xcrun -sdk macosx --show-sdk-path |
287 |
-- OUTPUT_VARIABLE OSX_SYSROOT |
288 |
-- ERROR_QUIET |
289 |
-- OUTPUT_STRIP_TRAILING_WHITESPACE) |
290 |
-- if (NOT OSX_SYSROOT OR NOT EXISTS ${OSX_SYSROOT}) |
291 |
-- message(WARNING "Detected OSX_SYSROOT ${OSX_SYSROOT} does not exist") |
292 |
-- else() |
293 |
-- message(STATUS "Found OSX_SYSROOT: ${OSX_SYSROOT}") |
294 |
-- set(OSX_SYSROOT_FLAG "-isysroot${OSX_SYSROOT}") |
295 |
-- endif() |
296 |
-- else() |
297 |
-- set(OSX_SYSROOT_FLAG "") |
298 |
-- endif() |
299 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
300 |
-+ set(OSX_SYSROOT_FLAG "") |
301 |
- |
302 |
- option(COMPILER_RT_ENABLE_IOS "Enable building for iOS" On) |
303 |
- option(COMPILER_RT_ENABLE_WATCHOS "Enable building for watchOS - Experimental" Off) |
304 |
---- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake.ORIG 2021-01-29 09:54:20.879593534 +0100 |
305 |
-+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake 2021-01-29 10:00:45.701607884 +0100 |
306 |
-@@ -273,7 +273,8 @@ |
307 |
- ${ARGN}) |
308 |
- set(libname "${name}.${suffix}_${LIB_ARCH}_${LIB_OS}") |
309 |
- add_library(${libname} STATIC ${LIB_SOURCES}) |
310 |
-- if(DARWIN_${LIB_OS}_SYSROOT) |
311 |
-+ # Do not add -isysroot flag on Gentoo Prefix (search paths handled by cmake) |
312 |
-+ if(DARWIN_${LIB_OS}_SYSROOT AND NOT "${LIB_OS}" STREQUAL "osx") |
313 |
- set(sysroot_flag -isysroot ${DARWIN_${LIB_OS}_SYSROOT}) |
314 |
- endif() |
315 |
- |
316 |
---- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake.ORIG 2021-01-29 09:54:20.879593534 +0100 |
317 |
-+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake 2021-01-29 10:01:40.267609919 +0100 |
318 |
-@@ -278,7 +278,8 @@ |
319 |
- if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) |
320 |
- list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}") |
321 |
- endif() |
322 |
-- if(CMAKE_SYSROOT) |
323 |
-+ # Do not add --sysroot flag on Gentoo Prefix (search paths handled by cmake) |
324 |
-+ if(CMAKE_SYSROOT AND NOT APPLE) |
325 |
- list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}") |
326 |
- endif() |
327 |
- string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}") |