summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-12-12 23:44:39 -0500
committerMike Frysinger <vapier@gentoo.org>2015-12-12 23:45:46 -0500
commit837dc289f66ec6830a5175f28311b73f20250e07 (patch)
treed2c3961ea33df581d42892dc88affea3ab1166be /eclass/toolchain.eclass
parenttoolchain.eclass: fix warnings when progs are linked (diff)
downloadgentoo-837dc289f66ec6830a5175f28311b73f20250e07.tar.gz
gentoo-837dc289f66ec6830a5175f28311b73f20250e07.tar.bz2
gentoo-837dc289f66ec6830a5175f28311b73f20250e07.zip
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.
Diffstat (limited to 'eclass/toolchain.eclass')
-rw-r--r--eclass/toolchain.eclass5
1 files changed, 5 insertions, 0 deletions
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}"