summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-07-12 23:17:03 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2019-07-13 00:37:33 +0100
commitbbc72dc75013128bb0a235010690db8b5cac7e30 (patch)
treea3573fac7a1268482e720f34eaf85b016a066892 /eclass
parenttoolchain.eclass: add 'einfo' when last cross-compiler is removed (diff)
downloadgentoo-bbc72dc75013128bb0a235010690db8b5cac7e30.tar.gz
gentoo-bbc72dc75013128bb0a235010690db8b5cac7e30.tar.bz2
gentoo-bbc72dc75013128bb0a235010690db8b5cac7e30.zip
toolchain.eclass: update active cross-gcc on uninstall
gcc-config-2 changed /usr/bin/gcc from a binary to symlink in commit b907ef80bc421df23515afc4c306e4d96c67649 ("Convert binary wrapper to a symlink wrapper.") Before the above change /usr/bin/gcc worked in both cases when active cross-gcc is being uninstalled. After the above change symlink becomes dangling. The change runs `gcc-config` more aggressively. Reported-by: Pietro Closes: https://bugs.gentoo.org/680360 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/toolchain.eclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 9caed25f55a7..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
@@ -2265,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