commit: e6ace6b5dfc0a324ed2b848448acd3b1e2834847
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 13:00:48 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 13:01:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ace6b5
sys-libs/compiler-rt: add bootstrap workaround like for libcxx
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild | 9 +++++++--
sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild | 9 +++++++--
sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild | 9 +++++++--
sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild | 9 +++++++--
sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild | 9 +++++++--
5 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
index e7c52642928..45cc6aa7b63 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -46,7 +46,12 @@ pkg_pretend() {
}
pkg_setup() {
- llvm_pkg_setup
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ llvm_pkg_setup
+ fi
python-any-r1_pkg_setup
}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
index e93bdde90a8..07412646ab2 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,12 @@ pkg_pretend() {
}
pkg_setup() {
- llvm_pkg_setup
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ llvm_pkg_setup
+ fi
python-any-r1_pkg_setup
}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
index e93bdde90a8..07412646ab2 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,12 @@ pkg_pretend() {
}
pkg_setup() {
- llvm_pkg_setup
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ llvm_pkg_setup
+ fi
python-any-r1_pkg_setup
}
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
index e93bdde90a8..07412646ab2 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.1_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,12 @@ pkg_pretend() {
}
pkg_setup() {
- llvm_pkg_setup
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ llvm_pkg_setup
+ fi
python-any-r1_pkg_setup
}
diff --git a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
index e93bdde90a8..07412646ab2 100644
--- a/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -48,7 +48,12 @@ pkg_pretend() {
}
pkg_setup() {
- llvm_pkg_setup
+ # Darwin Prefix builds do not have llvm installed yet, so rely on
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead
+ # of using llvm_pkg_setup.
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+ llvm_pkg_setup
+ fi
python-any-r1_pkg_setup
}
