toolchain.eclass: don't strip EPREFIX in dosym

This reverts 'dosym' part of
    "toolchain.eclass: Prepend/strip EPREFIX"
patch. portage-2.3.85 and above contains
    "dosym: revert deprecated prefix compat (bug 615594)"
patch. That effectively breaks gcc's /usr/bin/ symlinks.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 54ad6df05d229af42f05e68e6d6529b9998e98d6..90f7b68312bb5e3c2ecc80d3b6246eda87e66262 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1811,11 +1811,11 @@ toolchain_src_install() {
                if [[ -f ${CTARGET}-${x} ]] ; then
                        if ! is_crosscompile ; then
                                ln -sf ${CTARGET}-${x} ${x}
-                               dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+                               dosym ${BINPATH}/${CTARGET}-${x} \
                                        /usr/bin/${x}-${GCC_CONFIG_VER}
                        fi
                        # Create versioned symlinks
-                       dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+                       dosym ${BINPATH}/${CTARGET}-${x} \
                                /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
                fi