Use
${MAKE} ${CRUNCHENV} ... instead of ${CRUNCHENV} ${MAKE} ... so that CRUNCHENV overrides any user-provided command-line make(1) variables. This fixes /rescue build problems for people who pass settings such as MKKERBEROS=yes in via the make(1) command-line.
This commit is contained in:
parent
c860ec870a
commit
8fa2b6b361
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.crunch,v 1.17 2005/01/18 12:30:21 lukem Exp $
|
||||
# $NetBSD: Makefile.crunch,v 1.18 2005/01/19 01:18:59 lukem Exp $
|
||||
#
|
||||
# Makefile snippet to build a crunchgen(1)ed binary from the provided lists
|
||||
#
|
||||
|
@ -12,7 +12,9 @@
|
|||
# SMALLPROG_INET6 if != 0 and SMALLPROG != 0, and ${USE_INET6} != "no",
|
||||
# add SMALLPROG_INET6=1 to CRUNCHENV. [default: 0]
|
||||
# CRUNCHENV environment to pass to crunchgen(1) and when building
|
||||
# the crunched program.
|
||||
# the crunched program with make(1) (as command line
|
||||
# variables, to override any user provided environment
|
||||
# or make(1) cmdline vars).
|
||||
# CRUNCHGEN_FLAGS extra options to crunchgen(1)
|
||||
# DESTDIR destination directory
|
||||
# PARSELISTENV environment variables to set for parselist.awk
|
||||
|
@ -38,7 +40,7 @@ CRUNCHENV+= SMALLPROG_INET6=1
|
|||
|
||||
.PHONY: ${CRUNCHBIN}
|
||||
${CRUNCHBIN}: ${CRUNCHBIN}.mk ${CRUNCHBIN}.cache ${CRUNCHBIN}.c
|
||||
${CRUNCHENV} ${MAKE} -f ${CRUNCHBIN}.mk ${CRUNCHBIN}.crunched
|
||||
${MAKE} ${CRUNCHENV} -f ${CRUNCHBIN}.mk ${CRUNCHBIN}.crunched
|
||||
|
||||
${CRUNCHBIN}.c: ${CRUNCHBIN}.mk
|
||||
[ ! -f ${.TARGET} ] || touch ${.TARGET}
|
||||
|
|
Loading…
Reference in New Issue