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: Sat, 17 Jul 2021 18:50:09
Message-Id: 1626547800.050772120fa8d43533087c57c2a961bf54d6466e.williamh@gentoo
1 commit: 050772120fa8d43533087c57c2a961bf54d6466e
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 17 18:49:44 2021 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 17 18:50:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05077212
7
8 dev-lang/go: sync live
9
10 Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
11
12 dev-lang/go/go-9999.ebuild | 8 ++++----
13 1 file changed, 4 insertions(+), 4 deletions(-)
14
15 diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
16 index 9d3bb807e83..135a6fe19a9 100644
17 --- a/dev-lang/go/go-9999.ebuild
18 +++ b/dev-lang/go/go-9999.ebuild
19 @@ -31,6 +31,7 @@ HOMEPAGE="https://golang.org"
20
21 LICENSE="BSD"
22 SLOT="0/${PV}"
23 +IUSE="cpu_flags_x86_sse2"
24
25 BDEPEND="|| (
26 dev-lang/go
27 @@ -114,7 +115,7 @@ src_compile() {
28 fi
29
30 export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
31 - export GOROOT="$(pwd)"
32 + export GOROOT="${PWD}"
33 export GOBIN="${GOROOT}/bin"
34
35 # Go's build script does not use BUILD/HOST/TARGET consistently. :(
36 @@ -126,9 +127,8 @@ src_compile() {
37 export GOOS=$(go_os)
38 export CC_FOR_TARGET=$(tc-getCC)
39 export CXX_FOR_TARGET=$(tc-getCXX)
40 - if [[ ${ARCH} == arm ]]; then
41 - export GOARM=$(go_arm)
42 - fi
43 + use arm && export GOARM=$(go_arm)
44 + use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
45
46 cd src
47 bash -x ./make.bash || die "build failed"