git: Replace legacy make with bmake

John Marino marino at crater.dragonflybsd.org
Sun Oct 28 06:34:02 PDT 2012


commit 3da8e88fd44bdb1ff2af162b8fecd7c65d5e533b
Author: John Marino <draco at marino.st>
Date:   Sun Oct 28 13:38:32 2012 +0100

    Replace legacy make with bmake
    
    The proper way to detect which make is building the makefile is to check
    for .PARSEDIR.  If present, bmake is processing the makefile.  For the
    time being, both make will be supported for bootstrapping purposes, but
    in time the check can be removed, say for the DragonFly 3.6 release.
    
    The abundance of .ORDER commands in bsd.dep.mk caused a breakage when
    building world in parallel with bmake.  Likely some order constraints
    were impossible to achieve, and bmake just stopped while legacy did the
    best it could.  In any case, the majority of the .ORDER commands were
    replaced by a single .ORDER command which solved the problem.
    
    The legacy make is disconnected in this commit set, but the source files
    will be removed soon.

Summary of changes:
 Makefile                     |    6 +++
 Makefile.inc1                |   81 ++++++++++++++++++++++++++++--------------
 lib/i18n_module/Makefile.inc |    7 +++-
 lib/libc/citrus/Makefile.inc |    8 ++++
 nrelease/Makefile            |    9 ++++-
 share/mk/bsd.cpu.mk          |    6 +++
 share/mk/bsd.dep.mk          |   22 ++++-------
 share/mk/bsd.obj.mk          |    8 ++++-
 share/mk/bsd.subdir.mk       |    2 +-
 share/mk/bsd.sys.mk          |   14 +++++++
 share/mk/sys.mk              |   18 +++++++++-
 usr.bin/Makefile             |    2 +-
 usr.sbin/config/mkmakefile.c |    6 +++
 13 files changed, 140 insertions(+), 49 deletions(-)

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/3da8e88fd44bdb1ff2af162b8fecd7c65d5e533b


-- 
DragonFly BSD source repository



More information about the Commits mailing list