d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Building on fmake is no longer possible so removed tests for bmake.

Browse Source
This commit is contained in:
Simon J. Gerraty 2015-06-10 18:14:38 +00:00
parent 4cc6b8394f
commit f5374544f1
7 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/bsd.dep.mk
View File

@ -147,7 +147,6 @@ beforedepend: ${DHDRS}
beforebuild: ${DHDRS}
.endif
.if defined(.PARSEDIR)
.if ${MK_META_MODE} == "yes"
.include <meta.autodep.mk>
# this depend: bypasses that below
@ -156,7 +155,6 @@ depend: beforedepend ${DPSRCS} ${SRCS} afterdepend
beforedepend:
afterdepend: beforedepend
.endif
.endif
.if !target(depend)
.if defined(SRCS)

2
share/mk/bsd.init.mk
View File

@ -16,11 +16,9 @@ __<bsd.init.mk>__:
.include <bsd.own.mk>
.MAIN: all
.if defined(.PARSEDIR)
.if ${.MAKE.LEVEL:U1} == 0 && ${BUILD_AT_LEVEL0:Uyes:tl} == "no" && !make(clean*)
# this tells lib.mk and prog.mk to not actually build anything
_SKIP_BUILD = not building at level 0
.endif
.endif
.endif # !target(__<bsd.init.mk>__)

4
share/mk/bsd.own.mk
View File

@ -128,10 +128,8 @@ __<bsd.own.mk>__:
.if ${MK_CTF} != "no"
CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300)
CTFCONVERT_CMD=
.else
CTFCONVERT_CMD= @:
CTFCONVERT_CMD=
.endif
.if ${MK_INSTALL_AS_USER} != "no"

4
share/mk/bsd.progs.mk
View File

@ -22,14 +22,10 @@ PROGS += ${PROGS_CXX}
# In meta mode, we can capture dependenices for _one_ of the progs.
# if makefile doesn't nominate one, we use the first.
.if defined(.PARSEDIR)
.ifndef UPDATE_DEPENDFILE_PROG
UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
.export UPDATE_DEPENDFILE_PROG
.endif
.else
UPDATE_DEPENDFILE_PROG?= no
.endif
.ifndef PROG
# They may have asked us to build just one

2
share/mk/bsd.subdir.mk
View File

@ -34,7 +34,7 @@ __<bsd.subdir.mk>__:
.include <bsd.init.mk>
.if defined(.PARSEDIR) && !defined(NEED_SUBDIR)
.if !defined(NEED_SUBDIR)
.if ${.MAKE.LEVEL} == 0 && ${MK_META_MODE} == "yes" && !empty(SUBDIR) && !(make(clean*) || make(destroy*))
.include <meta.subdir.mk>
# ignore this

2
share/mk/local.init.mk
View File

@ -1,7 +1,6 @@
.include "src.opts.mk"
.if defined(.PARSEDIR)
.if ${.MAKE.MODE:Unormal:Mmeta*} != ""
.if !empty(SUBDIR) && !defined(LIB) && !defined(PROG) && ${.MAKE.MAKEFILES:M*bsd.prog.mk} == ""
.if ${.MAKE.MODE:Mleaf*} != ""
@ -10,7 +9,6 @@
.endif
.endif
.endif
.endif
.if ${MK_SYSROOT} == "yes" && !empty(SYSROOT)
CFLAGS_LAST+= --sysroot=${SYSROOT}

19
share/mk/sys.mk
View File

@ -97,17 +97,9 @@ ECHODIR ?= true
.endif
.endif
.if defined(.PARSEDIR)
# _+_ appears to be a workaround for the special src .MAKE not working.
# setting it to + interferes with -N
_+_ ?=
.elif !empty(.MAKEFLAGS:M-n) && ${.MAKEFLAGS:M-n} == "-n"
# the check above matches only a single -n, so -n -n will result
# in _+_ = +
_+_ ?=
.else
_+_ ?= +
.endif
.if defined(%POSIX)
FC ?= fort77
@ -369,16 +361,6 @@ SHELL= ${__MAKE_SHELL}
.SHELL: path=${__MAKE_SHELL}
.endif
.if !defined(.PARSEDIR)
# We are not bmake, which is more aggressive about searching .PATH
# It is sometime necessary to curb its enthusiasm with .NOPATH
# The following allows us to quietly ignore .NOPATH when not using bmake.
.NOTMAIN: .NOPATH
.NOPATH:
# Toggle on warnings
.WARN: dirsyntax
.else # is bmake
# Tell bmake to expand -V VAR by default
.MAKE.EXPAND_VARIABLES= yes
@ -395,7 +377,6 @@ SHELL= ${__MAKE_SHELL}
echoFlag=v errFlag=e \
path=${__MAKE_SHELL:U/bin/sh}
.endif
.endif # bmake
.include <bsd.cpu.mk>