diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-14 11:04:34 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-14 11:04:34 +0100 |
| commit | dd762ff83c330186ee2ede002e08b2f780cddd51 (patch) | |
| tree | 63198edcc3ad5df8e2566c28ff9bd8af50cc2174 /eclass/toolchain.eclass | |
| parent | 51af5f0eb4cddbe6aa7953717873691d77aae9ff (diff) | |
gentoo resync : 14.07.2019
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 3d997fb65819..6bc04b4cbfe4 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -2241,6 +2241,7 @@ toolchain_pkg_postinst() { } toolchain_pkg_postrm() { + do_gcc_config if [[ ! ${ROOT%/} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then eselect compiler-shadow clean all fi @@ -2253,6 +2254,7 @@ toolchain_pkg_postrm() { # clean up the cruft left behind by cross-compilers if is_crosscompile ; then if [[ -z $(ls "${EROOT%/}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then + einfo "Removing last cross-compiler instance. Deleting dangling symlinks." rm -f "${EROOT%/}"/etc/env.d/gcc/config-${CTARGET} rm -f "${EROOT%/}"/etc/env.d/??gcc-${CTARGET} rm -f "${EROOT%/}"/usr/bin/${CTARGET}-{gcc,{g,c}++}{,32,64} @@ -2264,9 +2266,6 @@ toolchain_pkg_postrm() { [[ ${ROOT%/} ]] && return 0 if [[ ! -e ${LIBPATH}/libstdc++.so ]] ; then - # make sure the profile is sane during same-slot upgrade #289403 - do_gcc_config - einfo "Running 'fix_libtool_files.sh ${GCC_RELEASE_VER}'" fix_libtool_files.sh ${GCC_RELEASE_VER} if [[ -n ${BRANCH_UPDATE} ]] ; then |