Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/go/
Date: Fri, 10 Mar 2017 01:31:10
Message-Id: 1489109435.15e685eec630dfef63d3f20854a8becf23ae3211.williamh@gentoo
1 commit: 15e685eec630dfef63d3f20854a8becf23ae3211
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 10 01:29:23 2017 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 10 01:30:35 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e685ee
7
8 dev-lang/go: sync live ebuild
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-lang/go/go-9999.ebuild | 8 +++++---
13 1 file changed, 5 insertions(+), 3 deletions(-)
14
15 diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
16 index 11d1819c35f..1137d737fef 100644
17 --- a/dev-lang/go/go-9999.ebuild
18 +++ b/dev-lang/go/go-9999.ebuild
19 @@ -162,10 +162,12 @@ src_compile()
20 export GOROOT_BOOTSTRAP="${WORKDIR}"/go-$(go_os)-$(go_arch)-bootstrap
21 if use gccgo; then
22 mkdir -p "${GOROOT_BOOTSTRAP}/bin" || die
23 - local go_binary=$(gcc-config --get-bin-path)/go-5
24 + local go_binary=$(gcc-config --get-bin-path)/go-$(gcc-major-version)
25 [[ -x ${go_binary} ]] || go_binary=$(
26 - find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-5 | sort -V | tail -n1)
27 - [[ -x ${go_binary} ]] || die "go-5: command not found"
28 + find "${EPREFIX}"/usr/${CHOST}/gcc-bin/*/go-$(gcc-major-version) |
29 + sort -V | tail -n1)
30 + [[ -x ${go_binary} ]] ||
31 + die "go-$(gcc-major-version): command not found"
32 ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
33 fi
34 export GOROOT_FINAL="${EPREFIX}"/usr/lib/go