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: Thu, 23 Jan 2020 17:28:25
Message-Id: 1579800477.b9c68429af12729cb69a71be19e99216921f0af0.williamh@gentoo
1 commit: b9c68429af12729cb69a71be19e99216921f0af0
2 Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
3 AuthorDate: Thu Jan 23 17:27:02 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=b9c68429
7
8 dev-lang/go: prefer go over go-bootstrap for building
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 dev-lang/go/go-9999.ebuild | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
16 index 82c9facbd67..e72c431625b 100644
17 --- a/dev-lang/go/go-9999.ebuild
18 +++ b/dev-lang/go/go-9999.ebuild
19 @@ -145,10 +145,10 @@ src_compile()
20 [[ -x ${go_binary} ]] ||
21 die "go-$(gcc-major-version): command not found"
22 ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die
23 - elif has_version -b dev-lang/go-bootstrap; then
24 - export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
25 elif has_version -b dev-lang/go; then
26 export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
27 + elif has_version -b dev-lang/go-bootstrap; then
28 + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
29 else
30 eerror "Go cannot be built without go or go-bootstrap installed"
31 die "Should not be here, please report a bug"