From 837dc289f66ec6830a5175f28311b73f20250e07 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 12 Dec 2015 23:44:39 -0500 Subject: [PATCH] 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 eb6c4a19fe1a..43fa8bffc970 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}" -- 2.26.2