toolchain.eclass: install gcc-5 go binary as go-5 #567806

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7dade5cf192c76ea02b5616c1abd9c8e2080e144..03e550dd6f72cbd48635d496cf0ea0ba4f85077b 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1684,10 +1684,12 @@ 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
+       # Rename 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
+               for x in go gofmt; do
+                       mv ${x} ${x}-${GCCMAJOR} || die
+               done
        fi
 
        # Now do the fun stripping stuff