| 1 |
commit: 4ee391c4a0409d1c03eb47e0ce86050d6572fbea |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 2 13:20:04 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=4ee391c4 |
| 7 |
|
| 8 |
sys-libs/compiler-rt: 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 |
sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild | 9 ++++++++- |
| 16 |
sys-libs/compiler-rt/compiler-rt-9999.ebuild | 9 ++++++++- |
| 17 |
2 files changed, 16 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild |
| 20 |
index 9b135a41b32..d60c84ee2d6 100644 |
| 21 |
--- a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild |
| 22 |
+++ b/sys-libs/compiler-rt/compiler-rt-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 |
@@ -77,6 +77,13 @@ src_configure() { |
| 30 |
-DCOMPILER_RT_BUILD_XRAY=OFF |
| 31 |
) |
| 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 |
if use test; then |
| 41 |
mycmakeargs+=( |
| 42 |
-DLIT_COMMAND="${EPREFIX}/usr/bin/lit" |
| 43 |
|
| 44 |
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild |
| 45 |
index 4dd44182ae9..7c6eb6db761 100644 |
| 46 |
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild |
| 47 |
+++ b/sys-libs/compiler-rt/compiler-rt-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 |
@@ -81,6 +81,13 @@ src_configure() { |
| 55 |
-DCOMPILER_RT_BUILD_XRAY=OFF |
| 56 |
) |
| 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 |
if use test; then |
| 66 |
mycmakeargs+=( |
| 67 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
Archives