--- smage/trunk/include/gcc-toolchain.sminc	2017/07/24 12:44:14	9533
+++ smage/trunk/include/gcc-toolchain.sminc	2019/10/29 21:06:32	13765
@@ -29,6 +29,21 @@
 	fi
 }
 
+uninstall_gcc_library()
+{
+	local library="$1"
+
+	cd ${SRCDIR}/build
+	mmake -C ${CHOST}/${library} DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
+	if [[ $(mlibdir) != lib ]]
+	then
+		if [ -d ${CHOST}/32/${library} ]
+		then
+			mmake -C ${CHOST}/32/${library} DESTDIR=${BINDIR} uninstall-toolexeclibLTLIBRARIES || die
+		fi
+	fi
+}
+
 versionize_all_bins()
 {
 	local bin
@@ -49,8 +64,12 @@
 {
 	local libs="$@"
 
-	# cleanup, only keep the libs, everything else get provided by the dev-package
-	zapmost ${BINDIR}/usr/$(mlibdir) "${libs}" || die
+	# run zapmost only if the directories exists, which fixes empy libvtv issues
+	if [[ -d ${BINDIR}/usr/$(mlibdir) ]]
+	then
+		# cleanup, only keep the libs, everything else get provided by the dev-package
+		zapmost ${BINDIR}/usr/$(mlibdir) "${libs}" || die
+	fi
 	# multilib as well
 	if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
 	then
@@ -69,7 +88,11 @@
 	# cleanup, the solibs are provided by the non-dev package
 	for i in ${libs}
 	do
-		rm ${BINDIR}/usr/$(mlibdir)/${i} || die
+		# run cleanup only if the directories exists, which fixes empy libvtv issues
+		if [[ -d ${BINDIR}/usr/$(mlibdir) ]]
+		then
+			rm ${BINDIR}/usr/$(mlibdir)/${i} || die
+		fi
 		# multilib as well
 		if [[ $(mlibdir) != lib ]] && [[ -d ${BINDIR}/usr/lib ]]
 		then