commit: 1ab39bcc7a08c49bf75e6c993cd37cdf4da594fa
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 00:32:44 2017 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 00:33:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ab39bcc
dev-lang/go: fix 1.8 gccgo bootstrap wrt #606440
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-lang/go/go-1.8.ebuild | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dev-lang/go/go-1.8.ebuild b/dev-lang/go/go-1.8.ebuild
index 11d1819c35f..1137d737fef 100644
--- a/dev-lang/go/go-1.8.ebuild
+++ b/dev-lang/go/go-1.8.ebuild
@@ -162,10 +162,12 @@ src_compile()
export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
if use gccgo; then
mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
- local go_binary=$(gcc-config --get-bin-path)/go-5
+ local go_binary=$(gcc-config
--get-bin-path)/go-$(gcc-major-version)
[[ -x ${go_binary} ]] || go_binary=$(
- find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | sort -V
| tail -n1)
- [[ -x ${go_binary} ]] || die "go-5: command not found"
+ find
"${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
+ sort -V | tail -n1)
+ [[ -x ${go_binary} ]] ||
+ die "go-$(gcc-major-version): command not found"
ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
fi
export GOROOT_FINAL="${EPREFIX}"/usr/lib/go