From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 716371388C2 for ; Sun, 13 Dec 2015 04:46:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B281D21C02B; Sun, 13 Dec 2015 04:46:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAAF621C081 for ; Sun, 13 Dec 2015 04:46:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A832534087E for ; Sun, 13 Dec 2015 04:45:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CC86CB2 for ; Sun, 13 Dec 2015 04:45:57 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1449981946.837dc289f66ec6830a5175f28311b73f20250e07.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/toolchain.eclass X-VCS-Directories: eclass/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 837dc289f66ec6830a5175f28311b73f20250e07 X-VCS-Branch: master Date: Sun, 13 Dec 2015 04:45:57 +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: 754b66a9-5d64-4b12-ad54-b2e6a3fdf9cd X-Archives-Hash: 1e78877397bca0b3f0634060adb15f6f commit: 837dc289f66ec6830a5175f28311b73f20250e07 Author: Mike Frysinger gentoo org> AuthorDate: Sun Dec 13 04:44:39 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Dec 13 04:45:46 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=837dc289 toolchain.eclass: delete `go` and `gofmt` for now #567806 We have dev-lang/go provide `go` and `gofmt`, and having gcc include these in its BINPATH causes gcc-config to clobber the go package with symlinks. Drop the gcc versions for now (they're copies from the go package anyways) until we have a better solution. eclass/toolchain.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index eb6c4a1..43fa8bf 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1686,6 +1686,11 @@ toolchain_src_install() { ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} fi done + # Clear out the main go binaries as we don't want to clobber dev-lang/go + # when gcc-config runs. #567806 + if tc_version_is_at_least 5 && is_go ; then + rm -f go gofmt + fi # Now do the fun stripping stuff env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"