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 rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.278 retrieving revision 1.289 diff -u -p -r1.278 -r1.289 --- src/Makefile 2010/07/06 05:59:50 1.278 +++ src/Makefile 2011/09/09 14:23:37 1.289 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.278 2010/07/06 05:59:50 mrg Exp $ +# $NetBSD: Makefile,v 1.289 2011/09/09 14:23:37 apb Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -87,11 +87,10 @@ # gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and # gnu/lib/libgcc${LIBGCC_EXT}. # do-libpcc: builds and install prerequisites from -# external/bsd/pcc/crtstuff and external/bsd/pcc/libpcc. +# external/bsd/pcc/crtstuff (if necessary) and +# external/bsd/pcc/libpcc. # do-lib-libc: builds and installs prerequisites from lib/libc. # do-lib: builds and installs prerequisites from lib. -# do-gnu-lib: builds and installs prerequisites from gnu/lib. -# do-external-lib: builds and installs prerequisites from external/lib. # do-sys-rump-dev-lib: builds and installs prerequisites from sys/rump/dev/lib # do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib # do-sys-rump-kern-lib: builds and installs prereq. from sys/rump/kern/lib @@ -200,10 +199,14 @@ postinstall-fix-obsolete: .NOTMAIN .PHON # Targets (in order!) called by "make build". # .if defined(HAVE_GCC) -.if ${HAVE_GCC} == "3" -LIBGCC_EXT=3 -.else +.if ${HAVE_GCC} == "4" LIBGCC_EXT=4 +BUILD_CC_LIB_BASEDIR= gnu/lib +BUILD_CC_LIB_BASETARGET= gnu-lib +.else +LIBGCC_EXT= +BUILD_CC_LIB_BASEDIR= external/gpl3/gcc/lib +BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib .endif .endif @@ -239,8 +242,8 @@ BUILDTARGETS+= do-libgcc BUILDTARGET+= do-libpcc .endif BUILDTARGETS+= do-lib-libc -BUILDTARGETS+= do-lib do-gnu-lib do-external-lib -.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no" +BUILDTARGETS+= do-lib +.if ${MKKMOD} != "no" BUILDTARGETS+= do-sys-modules .endif BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib @@ -333,12 +336,35 @@ installworld: .PHONY .MAKE .endif .endif ${MAKEDIRTARGET} distrib/sets installsets \ - INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS= + INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q} ${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR} @echo "make ${.TARGET} started at: ${START_TIME}" @printf "make ${.TARGET} finished at: " && date # +# Install modules from $DESTDIR to $INSTALLMODULESDIR +# +installmodules: .PHONY .MAKE +.if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") + @echo "Can't make ${.TARGET} to DESTDIR=/" + @false +.endif +.if !defined(INSTALLMODULESDIR) || \ + ${INSTALLMODULESDIR} == "" || ${INSTALLMODULESDIR} == "/" +.if (${HOST_UNAME_S} != "NetBSD") + @echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_S} to NetBSD with INSTALLMODULESDIR=/" + @false +.endif +.if (${HOST_UNAME_M} != ${MACHINE}) + @echo "Won't cross-make ${.TARGET} from ${HOST_UNAME_M} to ${MACHINE} with INSTALLMODULESDIR=/" + @false +.endif +.endif + ${MAKEDIRTARGET} sys/modules install DESTDIR=${INSTALLMODULESDIR:U/} + @echo "make ${.TARGET} started at: ${START_TIME}" + @printf "make ${.TARGET} finished at: " && date + +# # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR # @@ -409,14 +435,16 @@ do-${targ}: .PHONY ${targ} .endfor .if defined(HAVE_GCC) -BUILD_CC_LIB= gnu/lib/crtstuff${LIBGCC_EXT} -BUILD_CC_LIB+= gnu/lib/libgcc${LIBGCC_EXT} +.if ${USE_COMPILERCRTSTUFF} == "yes" +BUILD_CC_LIB= ${BUILD_CC_LIB_BASEDIR}/crtstuff${LIBGCC_EXT} +.endif +BUILD_CC_LIB+= ${BUILD_CC_LIB_BASEDIR}/libgcc${LIBGCC_EXT} .elif defined(HAVE_PCC) BUILD_CC_LIB+= external/bsd/pcc/crtstuff BUILD_CC_LIB+= external/bsd/pcc/libpcc .endif -.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules +.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules do-${dir:S/\//-/g}: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} ${dir} ${targ} @@ -427,7 +455,7 @@ do-${dir:S/\//-/g}: .PHONY .MAKE COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc .for dir in ${COMPAT_SUBDIR_LIST} do-compat-${dir:S/\//-/g}: .PHONY .MAKE -.for targ in obj dependall install +.for targ in dependall install ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}" .endfor .endfor @@ -442,25 +470,29 @@ do-tools-obj: .PHONY .MAKE do-libgcc: .PHONY .MAKE .if defined(HAVE_GCC) .if ${MKGCC} != "no" -.if (${HAVE_GCC} == "3" || ${HAVE_GCC} == "4") - ${MAKEDIRTARGET} . do-gnu-lib-crtstuff${LIBGCC_EXT} +.if ${USE_COMPILERCRTSTUFF} == "yes" + ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT} .endif - ${MAKEDIRTARGET} . do-gnu-lib-libgcc${LIBGCC_EXT} + ${MAKEDIRTARGET} . do-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT} .endif .endif do-compat-libgcc: .PHONY .MAKE .if defined(HAVE_GCC) .if ${MKGCC} != "no" - ${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT} - ${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT} +.if ${USE_COMPILERCRTSTUFF} == "yes" + ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-crtstuff${LIBGCC_EXT} +.endif + ${MAKEDIRTARGET} . do-compat-${BUILD_CC_LIB_BASETARGET}-libgcc${LIBGCC_EXT} .endif .endif do-libpcc: .PHONY .MAKE .if defined(HAVE_PCC) .if ${MKPCC} != "no" +.if ${USE_COMPILERCRTSTUFF} == "yes" ${MAKEDIRTARGET} . do-pcc-lib-crtstuff +.endif ${MAKEDIRTARGET} . do-pcc-lib-libpcc .endif .endif @@ -524,12 +556,6 @@ dependall-distrib depend-distrib all-dis .include .include -build-docs: .PHONY ${.CURDIR}/BUILDING -${.CURDIR}/BUILDING: doc/BUILDING.mdoc - ${_MKMSG_CREATE} ${.TARGET} - ${TOOL_GROFF} -mdoc -Tascii -P-bou $> >$@ - - # # Display current make(1) parameters #