1 |
commit: 0d3c717b69cc1f612070f99cfb923cc713819639 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 2 13:24:28 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 2 13:53:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3c717b |
7 |
|
8 |
sys-libs/compiler-rt-sanitizers: prefer compiler from prefix on Darwin |
9 |
|
10 |
Patch by Michael Weiser |
11 |
|
12 |
Bug: https://bugs.gentoo.org/642644 |
13 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
14 |
|
15 |
.../compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild | 9 ++++++++- |
16 |
.../compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild | 9 ++++++++- |
17 |
2 files changed, 16 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild |
20 |
index b57277b9fbe..439a8e639d6 100644 |
21 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild |
22 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2017 Gentoo Foundation |
25 |
+# Copyright 1999-2018 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI=6 |
29 |
@@ -101,6 +101,13 @@ src_configure() { |
30 |
strip-unsupported-flags |
31 |
fi |
32 |
|
33 |
+ if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then |
34 |
+ mycmakeargs+=( |
35 |
+ # disable use of SDK for the system itself |
36 |
+ -DDARWIN_macosx_CACHED_SYSROOT=/ |
37 |
+ ) |
38 |
+ fi |
39 |
+ |
40 |
cmake-utils_src_configure |
41 |
|
42 |
if use test; then |
43 |
|
44 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild |
45 |
index d13c7b67d32..ca1b1100329 100644 |
46 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild |
47 |
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild |
48 |
@@ -1,4 +1,4 @@ |
49 |
-# Copyright 1999-2017 Gentoo Foundation |
50 |
+# Copyright 1999-2018 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
|
53 |
EAPI=6 |
54 |
@@ -110,6 +110,13 @@ src_configure() { |
55 |
strip-unsupported-flags |
56 |
fi |
57 |
|
58 |
+ if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then |
59 |
+ mycmakeargs+=( |
60 |
+ # disable use of SDK for the system itself |
61 |
+ -DDARWIN_macosx_CACHED_SYSROOT=/ |
62 |
+ ) |
63 |
+ fi |
64 |
+ |
65 |
cmake-utils_src_configure |
66 |
|
67 |
if use test; then |