From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28004139694 for ; Fri, 10 Mar 2017 01:31:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45FFEE0C78; Fri, 10 Mar 2017 01:31:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22824E0C78 for ; Fri, 10 Mar 2017 01:31:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C1A133BE19 for ; Fri, 10 Mar 2017 01:31:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E56462CF for ; Fri, 10 Mar 2017 01:31:06 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1489109435.15e685eec630dfef63d3f20854a8becf23ae3211.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/go/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/go/go-9999.ebuild X-VCS-Directories: dev-lang/go/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 15e685eec630dfef63d3f20854a8becf23ae3211 X-VCS-Branch: master Date: Fri, 10 Mar 2017 01:31:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 08f68bc6-86b2-4587-a0d4-0282bd313b87 X-Archives-Hash: 5f0dfdee52d575514167732acf08ae03 commit: 15e685eec630dfef63d3f20854a8becf23ae3211 Author: William Hubbs gentoo org> AuthorDate: Fri Mar 10 01:29:23 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Mar 10 01:30:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e685ee dev-lang/go: sync live ebuild Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-lang/go/go-9999.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 11d1819c35f..1137d737fef 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.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