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 651D6139694 for ; Fri, 10 Mar 2017 00:33:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7C84E0C7D; Fri, 10 Mar 2017 00:33:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 92DEDE0C7D for ; Fri, 10 Mar 2017 00:33:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9D8113416D3 for ; Fri, 10 Mar 2017 00:33:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C5AA62C3 for ; Fri, 10 Mar 2017 00:33:46 +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: <1489105996.1ab39bcc7a08c49bf75e6c993cd37cdf4da594fa.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-1.8.ebuild X-VCS-Directories: dev-lang/go/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 1ab39bcc7a08c49bf75e6c993cd37cdf4da594fa X-VCS-Branch: master Date: Fri, 10 Mar 2017 00:33:46 +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: 8d925636-441c-45fb-b5bd-82967b1e59a3 X-Archives-Hash: 179e57556f1faaea090e7f4f82097cef commit: 1ab39bcc7a08c49bf75e6c993cd37cdf4da594fa Author: William Hubbs gentoo org> AuthorDate: Fri Mar 10 00:32:44 2017 +0000 Commit: William Hubbs gentoo 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