Date: Tue, 6 May 2014 04:22:37 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r265423 - in head: . share/mk usr.bin usr.bin/bmake usr.bin/make Message-ID: <201405060422.s464Mb2h066111@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue May 6 04:22:37 2014 New Revision: 265423 URL: http://svnweb.freebsd.org/changeset/base/265423 Log: Remove support for WITHOUT_BMAKE. bmake is now the only make that can build world, so it is the only make we build or install. fmake is still in the tree, but disconnected, and upgrades from older systems that still have bmake has not been removed, but its state has not been tested (it should work given how minimal the work to upgrade to bmake is). Modified: head/Makefile head/share/mk/src.opts.mk head/usr.bin/Makefile head/usr.bin/bmake/Makefile.inc head/usr.bin/make/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Tue May 6 04:22:29 2014 (r265422) +++ head/Makefile Tue May 6 04:22:37 2014 (r265423) @@ -139,11 +139,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH # Choices add to complexity though. # We cannot blindly use a make which may not be the one we want # so be exlicit - until all choice is removed. -.if !defined(WITHOUT_BMAKE) WANT_MAKE= bmake -.else -WANT_MAKE= fmake -.endif MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} .if defined(.PARSEDIR) HAVE_MAKE= bmake @@ -152,7 +148,7 @@ HAVE_MAKE= fmake .endif .if exists(${MYMAKE}) SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk -.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +.elif ${WANT_MAKE} != ${HAVE_MAKE} # It may not exist yet but we may cause it to. # In the case of fmake, upgrade_checks may cause a newer version to be built. SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Tue May 6 04:22:29 2014 (r265422) +++ head/share/mk/src.opts.mk Tue May 6 04:22:37 2014 (r265423) @@ -65,7 +65,6 @@ __DEFAULT_YES_OPTIONS = \ BINUTILS \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ - BMAKE \ BOOT \ BSD_CPIO \ BSNMP \ Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Tue May 6 04:22:29 2014 (r265422) +++ head/usr.bin/Makefile Tue May 6 04:22:37 2014 (r265423) @@ -279,11 +279,7 @@ SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" -.if ${MK_BMAKE} != "no" SUBDIR+= bmake -.else -SUBDIR+= make -.endif .endif .if ${MK_MAN_UTILS} != "no" Modified: head/usr.bin/bmake/Makefile.inc ============================================================================== --- head/usr.bin/bmake/Makefile.inc Tue May 6 04:22:29 2014 (r265422) +++ head/usr.bin/bmake/Makefile.inc Tue May 6 04:22:37 2014 (r265423) @@ -7,15 +7,7 @@ .export SRCTOP .endif -# Sadly, we cannot assume src.opts.mk did its job, -# nor can we safely include the one we want -.if !defined(WITHOUT_BMAKE) -MK_BMAKE= yes -.endif - -.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" PROG= make -.endif .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES Modified: head/usr.bin/make/Makefile ============================================================================== --- head/usr.bin/make/Makefile Tue May 6 04:22:29 2014 (r265422) +++ head/usr.bin/make/Makefile Tue May 6 04:22:37 2014 (r265423) @@ -111,12 +111,10 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\ .error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"." .endif -.if defined(MK_BMAKE) && ${MK_BMAKE} != "no" # if we are here we don't want this called 'make' PROG= fmake fmake.1: make.1 cp ${.ALLSRC} ${.TARGET} -.endif .if ${MK_TESTS} != "no" SUBDIR+= tests
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405060422.s464Mb2h066111>