From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 2 Jan 2018 13:20:04 +0000 (+0100)
Subject: sys-libs/compiler-rt: prefer compiler from prefix on Darwin
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4ee391c4a0409d1c03eb47e0ce86050d6572fbea;p=gentoo.git

sys-libs/compiler-rt: prefer compiler from prefix on Darwin

Patch by Michael Weiser

Bug: https://bugs.gentoo.org/642644
Package-Manager: Portage-2.3.13, Repoman-2.3.3
---

diff --git a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
index 9b135a41b328..d60c84ee2d67 100644
--- a/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,6 +77,13 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_XRAY=OFF
 	)
 
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
 	if use test; then
 		mycmakeargs+=(
 			-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
diff --git a/sys-libs/compiler-rt/compiler-rt-9999.ebuild b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
index 4dd44182ae9b..7c6eb6db761e 100644
--- a/sys-libs/compiler-rt/compiler-rt-9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,6 +81,13 @@ src_configure() {
 		-DCOMPILER_RT_BUILD_XRAY=OFF
 	)
 
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# disable use of SDK for the system itself
+			-DDARWIN_macosx_CACHED_SYSROOT=/
+		)
+	fi
+
 	if use test; then
 		mycmakeargs+=(
 			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"