[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Frysinger]

commit:     837dc289f66ec6830a5175f28311b73f20250e07
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 04:44:39 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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}"