- call each ${MKNATIVE_CONFIG_TARGET_LIBS} target separately

- comment out maybe-all-target-libgcc
- cope with the special transformation needed for gtyp-input.list

tools/gcc/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.41 2011/06/30 07:02:17 mrg Exp $
+#	$NetBSD: Makefile,v 1.42 2011/07/01 01:27:17 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -151,15 +151,17 @@ NATIVE_CONFIGURE_ARGS+=	\
 	# edit Makefile so that maybe-all-gcc does not depend on all-gcc any more.
 		(cd .native && mv Makefile Makefile.config && \
 			${TOOL_SED} -e 's/\(maybe-all-gcc:\) all-gcc/\1/' \
+				    -e 's/\(maybe-all-target-libgcc:\) all-target-libgcc/\1/' \
 				< Makefile.config > Makefile)
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h unwind.h)
+		(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
+.for _lib in ${MKNATIVE_CONFIG_TARGET_LIBS}
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
-		(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so && \
-			${MKNATIVE_ENV} ${BUILD_MAKE} \
-			${MKNATIVE_CONFIG_TARGET_LIBS} \
+		(cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE} \
+			${_lib} \
 			ALL_GCC_C= ALL_GCC_CXX= \
 			CC_FOR_TARGET=${CC:Q}' '${CCADDFLAGS:Q} \
 			CXX_FOR_TARGET=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
@@ -167,6 +169,7 @@ NATIVE_CONFIGURE_ARGS+=	\
 			CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
 			ac_cv_prog_cc_cross=yes) && \
 	true
+.endfor
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd .native/${MACHINE_GNU_PLATFORM}/libstdc++-v3/include && \
 			${MKNATIVE_ENV} ${BUILD_MAKE} \

tools/gcc/mknative-gcc

@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$NetBSD: mknative-gcc,v 1.55 2011/06/30 07:16:59 mrg Exp $
+#	$NetBSD: mknative-gcc,v 1.56 2011/07/01 01:27:17 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/gcc.
@@ -611,10 +611,15 @@ get_gcc () {
 		write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
 	done
 
-	# ones we want to keep identical
-	for f in all-tree.def gtyp-input.list; do
+	# keep identical
+	for f in all-tree.def; do
 		cp $_TMPDIR/gcc/$f $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
 	done
+
+	# special transforms
+	for f in gtyp-input.list; do
+		sed -e 's/^.*external\/gpl3\/gcc\/dist/SRCDIR/' < $_TMPDIR/gcc/$f > $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f
+	done
 }
 
 ##### main #####