| 1 |
commit: c96064ddc43312a5efdd935ae2dab684e6ec9068 |
| 2 |
Author: William Hubbs <william.hubbs <AT> sony <DOT> com> |
| 3 |
AuthorDate: Thu Jan 23 17:27:30 2020 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 23 17:27:57 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96064dd |
| 7 |
|
| 8 |
dev-lang/go: drop gccgo use flag |
| 9 |
|
| 10 |
Signed-off-by: William Hubbs <williamh <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-lang/go/go-9999.ebuild | 18 +++--------------- |
| 13 |
1 file changed, 3 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild |
| 16 |
index e72c431625b..405ca751d02 100644 |
| 17 |
--- a/dev-lang/go/go-9999.ebuild |
| 18 |
+++ b/dev-lang/go/go-9999.ebuild |
| 19 |
@@ -37,12 +37,10 @@ HOMEPAGE="https://golang.org" |
| 20 |
|
| 21 |
LICENSE="BSD" |
| 22 |
SLOT="0/${PV}" |
| 23 |
-IUSE="gccgo" |
| 24 |
|
| 25 |
-BDEPEND="gccgo? ( >=sys-devel/gcc-5[go(-)] ) |
| 26 |
- !gccgo? ( || ( |
| 27 |
+BDEPEND="|| ( |
| 28 |
dev-lang/go |
| 29 |
- dev-lang/go-bootstrap ) )" |
| 30 |
+ dev-lang/go-bootstrap )" |
| 31 |
RDEPEND="!<dev-go/go-tools-0_pre20150902" |
| 32 |
|
| 33 |
# These test data objects have writable/executable stacks. |
| 34 |
@@ -135,17 +133,7 @@ src_unpack() |
| 35 |
|
| 36 |
src_compile() |
| 37 |
{ |
| 38 |
- if use gccgo; then |
| 39 |
- export GOROOT_BOOTSTRAP="${WORKDIR}/go-bootstrap" |
| 40 |
- mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die |
| 41 |
- local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version) |
| 42 |
- [[ -x ${go_binary} ]] || go_binary=$( |
| 43 |
- find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) | |
| 44 |
- sort -V | tail -n1) |
| 45 |
- [[ -x ${go_binary} ]] || |
| 46 |
- die "go-$(gcc-major-version): command not found" |
| 47 |
- ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die |
| 48 |
- elif has_version -b dev-lang/go; then |
| 49 |
+ if has_version -b dev-lang/go; then |
| 50 |
export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" |
| 51 |
elif has_version -b dev-lang/go-bootstrap; then |
| 52 |
export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" |
Archives