Index: files/gcc-config-1.3.13
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v
--- files/gcc-config-1.3.13	9 Aug 2006 05:54:00 -0000	1.12
+++ files/gcc-config-1.3.13	6 Oct 2006 12:30:24 -0000
@@ -312,6 +312,13 @@ 
 			multilibdir=${multilib%;*}
 			libdir="lib/"$("${ROOT}/${GCC_BIN_PATH}"/gcc ${multiarg} -print-multi-os-directory)
 			if mkdir -p "${ROOT}/${libdir}"/.gcc.config.new ; then
+				# When changing the base libgcc_s.so.1, we must make sure that the new one
+				# is available during mv execution, or it fails if it's the first run of
+				# gcc-config (e.g.: on catalyst)
+				save_library_path="${LD_LIBRARY_PATH}"
+				if [[ ${ROOT} == "/" ]]; then
+					export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/${libdir}/.gcc.config.new"
+				fi
 				for gcclib in gcc_s unwind ; do
 					if [[ -n $(ls "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* 2>/dev/null) ]]; then
 						${CP} -pP "${ROOT}/${LDPATH}/${multilibdir}"/lib${gcclib}.so.* "${ROOT}/${libdir}"/.gcc.config.new/
@@ -319,6 +326,7 @@ 
 						${MV} -f "${ROOT}/${libdir}"/.gcc.config.new/* "${ROOT}/${libdir}"/
 					fi
 				done
+				export LD_LIBRARY_PATH="${save_library_path}"
 				rmdir "${ROOT}/${libdir}"/.gcc.config.new
 			fi
 		done