Initialize the FIXCRYPTO, BINMAKE and related variables (that use
the != operator) only when needed. This change allows me to check out the current version of release/ makefiles only (co -l) to /tmp/release, and use that directory to build a release (supplying the correct WORLDDIR). Without this, attempt to "make release" caused an endless fork bomb while trying to evaluate FIXCRYPTO, and the only way I could get away from this on a remote box was to "kill -INT 1", thanks to tcsh(1) and its internal "kill" command.
This commit is contained in:
parent
539f18e4a4
commit
9b72ad91bf
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=118209
@ -238,7 +238,7 @@ DISKLABEL?= disklabel
|
||||
ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -
|
||||
|
||||
# Things that need to be compiled without crypto support in releases
|
||||
.if !defined(FIXCRYPTO)
|
||||
.if !defined(FIXCRYPTO) && !make(release) && !make(rerelease)
|
||||
FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \
|
||||
cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS
|
||||
.endif
|
||||
@ -295,10 +295,12 @@ BOOTABLE="-b"
|
||||
DOCREL= doc.1 doc.2
|
||||
.endif
|
||||
|
||||
.if !make(release) && !make(rerelease)
|
||||
BINMAKE!= cd ${.CURDIR}/..; ${MAKE} -V BINMAKE
|
||||
WMAKEENV!= cd ${.CURDIR}/..; \
|
||||
${BINMAKE} ${CROSSENV} -f Makefile.inc1 -V WMAKEENV
|
||||
WMAKE= ${WMAKEENV} ${BINMAKE}
|
||||
.endif
|
||||
|
||||
CVS_SRCARGS= -P
|
||||
.if defined(RELEASETAG)
|
||||
|
Loading…
Reference in New Issue
Block a user