Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/Makefile,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -p -r1.243 -r1.244
--- src/Makefile	2006/01/28 21:34:08	1.243
+++ src/Makefile	2006/04/07 19:38:58	1.244
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.243 2006/01/28 21:34:08 apb Exp $
+#	$NetBSD: Makefile,v 1.244 2006/04/07 19:38:58 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -172,7 +172,11 @@ postinstall-fix-obsolete: .NOTMAIN .PHON
 # Targets (in order!) called by "make build".
 #
 .if ${USE_TOOLS_TOOLCHAIN} == "no"
+. if ${HAVE_GCC} == "3"
 LIBGCC_EXT=3
+. else
+LIBGCC_EXT=4
+. endif
 .else
 LIBGCC_EXT=
 .endif
@@ -196,7 +200,7 @@ BUILDTARGETS+=	includes
 BUILDTARGETS+=	do-tools-compat
 BUILDTARGETS+=	do-lib-csu
 .if ${MKGCC} != "no"
-.if ${HAVE_GCC3} != "no"
+.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4")
 BUILDTARGETS+=	do-gnu-lib-crtstuff${LIBGCC_EXT}
 .endif
 BUILDTARGETS+=	do-gnu-lib-libgcc${LIBGCC_EXT}