--- src/Makefile.inc1	2005/08/28 07:06:42	1.77
+++ src/Makefile.inc1	2005/09/05 15:36:34	1.78
@@ -811,6 +811,10 @@ _share=	share/syscons/scrnmaps
 
 _gcc34_cross= gnu/usr.bin/cc34
 _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools
+.if defined(WANT_GCC40)
+_gcc40_cross= gnu/usr.bin/cc40
+_gcc40_tools= gnu/usr.bin/cc40/cc_prep gnu/usr.bin/cc40/cc_tools
+.endif
 _binutils= gnu/usr.bin/binutils215
 
 .if !defined(NO_FORTRAN)
@@ -828,7 +832,7 @@ _sysinstall= release/sysinstall
 .endif
 
 build-tools:
-.for _tool in ${_gcc34_tools} ${_fortran} ${_libkrb5} ${_share} ${_sysinstall}
+.for _tool in ${_gcc34_tools} ${_gcc40_tools} ${_fortran} ${_libkrb5} ${_share}
 	${ECHODIR} "===> ${_tool} (build-tools)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -848,7 +852,7 @@ _btxld=	usr.sbin/btxld
 cross-tools:
 .for _tool in ${_btxld} ${_binutils} \
 	      usr.bin/objformat usr.sbin/crunch/crunchide \
-	      ${_gcc34_cross}
+	      ${_gcc34_cross} ${_gcc40_cross}
 	${ECHODIR} "===> ${_tool} (cross-tools)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
@@ -877,7 +881,13 @@ hierarchy:
 libraries:
 	cd ${.CURDIR}; \
 	    HOST_CCVER=${HOST_CCVER} CCVER=gcc34 \
-		${MAKE} -f Makefile.inc1 _startup_libs34; \
+		${MAKE} -f Makefile.inc1 _startup_libs34;
+.if defined(WANT_GCC40)
+	cd ${.CURDIR}; \
+	    HOST_CCVER=${HOST_CCVER} CCVER=gcc40 \
+		${MAKE} -f Makefile.inc1 _startup_libs40;
+.endif
+	cd ${.CURDIR}; \
 	    ${MAKE} -f Makefile.inc1 _startup_libs; \
 	    ${MAKE} -f Makefile.inc1 _prebuild_libs; \
 	    ${MAKE} -f Makefile.inc1 _generic_libs;
@@ -887,9 +897,10 @@ libraries:
 #
 # gnu/lib/${CCVER}/libgcc and lib/csu must be built before all
 # shared libraries for ELF.  The target for _startup_libs34 is
-# specifically built using gcc34.
+# specifically built using gcc34.  Same goes for _startup_libs40.
 #
 _startup_libs34=	gnu/lib/gcc34/libgcc
+_startup_libs40=	gnu/lib/gcc40/libgcc
 _startup_libs=	lib/csu/${MACHINE_ARCH}
 _startup_libs+=	lib/csu/common lib/libc lib/libc_rtld
 
@@ -929,7 +940,7 @@ _generic_libs+=	secure/lib
 
 _generic_libs+=	usr.bin/lex/lib
 
-.for _lib in ${_startup_libs2} ${_startup_libs3} ${_startup_libs34} \
+.for _lib in ${_startup_libs34} ${_startup_libs40} \
 		${_startup_libs} ${_prebuild_libs} ${_generic_libs}
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
@@ -943,6 +954,7 @@ ${_lib}__L: .PHONY
 
 _startup_libs: ${_startup_libs:S/$/__L/}
 _startup_libs34: ${_startup_libs34:S/$/__L/}
+_startup_libs40: ${_startup_libs40:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
 _generic_libs: ${_generic_libs:S/$/__L/}
 
@@ -950,6 +962,7 @@ _generic_libs: ${_generic_libs:S/$/__L/}
 # races (e.g. generation of tconfig.h)
 #
 .ORDER: ${_startup_libs34:S/$/__L/}
+.ORDER: ${_startup_libs40:S/$/__L/}
 .ORDER: ${_startup_libs:S/$/__L/}
 .ORDER: ${_prebuild_libs:S/$/__L/}
 .ORDER: ${_generic_libs:S/$/__L/}