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 2F0F3138350 for ; Thu, 23 Jan 2020 17:28:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F112E09CB; Thu, 23 Jan 2020 17:28:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BE9EE09CB for ; Thu, 23 Jan 2020 17:28:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F109D34E2EA for ; Thu, 23 Jan 2020 17:28:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC0643E for ; Thu, 23 Jan 2020 17:28:21 +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: <1579800477.b9c68429af12729cb69a71be19e99216921f0af0.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: b9c68429af12729cb69a71be19e99216921f0af0 X-VCS-Branch: master Date: Thu, 23 Jan 2020 17:28:21 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d6fa4de4-1ee4-4a35-95a4-4bd76ddd960f X-Archives-Hash: 29adde6604b9eeb684937bbc2540bc66 commit: b9c68429af12729cb69a71be19e99216921f0af0 Author: William Hubbs sony com> AuthorDate: Thu Jan 23 17:27:02 2020 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jan 23 17:27:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c68429 dev-lang/go: prefer go over go-bootstrap for building Signed-off-by: William Hubbs gentoo.org> dev-lang/go/go-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 82c9facbd67..e72c431625b 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -145,10 +145,10 @@ src_compile() [[ -x ${go_binary} ]] || die "go-$(gcc-major-version): command not found" ln -s "${go_binary}" "${GOROOT_BOOTSTRAP}/bin/go" || die - elif has_version -b dev-lang/go-bootstrap; then - export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" elif has_version -b dev-lang/go; then export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" + elif has_version -b dev-lang/go-bootstrap; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" else eerror "Go cannot be built without go or go-bootstrap installed" die "Should not be here, please report a bug"