diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index ebb63901fba55..df6ed170fe1f6 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -2782,10 +2782,15 @@ gcc_movelibs() {
 	# libgccjit gets installed to /usr/lib, not /usr/$(get_libdir). Probably
 	# due to a bug in gcc build system.
 	if [[ ${PWD} == "${WORKDIR}"/build-jit ]] ; then
-		if is_jit || _tc_use_if_iuse libgdiagnostics ; then
-			dodir "${LIBPATH#${EPREFIX}}"
+		dodir "${LIBPATH#${EPREFIX}}"
+
+		if is_jit ; then
 			mv "${ED}"/usr/lib/libgccjit* "${D}${LIBPATH}" || die
 		fi
+
+		if _tc_use_if_iuse libgdiagnostics ; then
+			mv "${ED}"/usr/lib/libgdiagnostics* "${D}${LIBPATH}" || die
+		fi
 	fi
 
 	# For all the libs that are built for CTARGET, move them into the