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

[Zac Medico]

commit:     3f171e23da269c77dfa9cb3097737e33db853c8d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 00:15:18 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 00:16:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f171e23

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

 eclass/toolchain.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7dade5c..03e550d 100644
--- 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