Upgrade make(1) if not passing the ``.if defined(notdef) && ${notdef:U}''
test (revealed by bsd.lib.mk,v 1.134).
This commit is contained in:
parent
9660d3718b
commit
0dfe6a120a
10
Makefile
10
Makefile
@ -172,7 +172,7 @@ kernel: buildkernel installkernel
|
|||||||
#
|
#
|
||||||
upgrade_checks:
|
upgrade_checks:
|
||||||
@cd ${.CURDIR}; \
|
@cd ${.CURDIR}; \
|
||||||
if ! make -m ${.CURDIR}/share/mk test > /dev/null 2>&1; then \
|
if ! make -m ${.CURDIR}/share/mk -Dnotdef test >/dev/null 2>&1; then \
|
||||||
make make; \
|
make make; \
|
||||||
fi
|
fi
|
||||||
@cd ${.CURDIR}; \
|
@cd ${.CURDIR}; \
|
||||||
@ -183,9 +183,15 @@ upgrade_checks:
|
|||||||
|
|
||||||
#
|
#
|
||||||
# A simple test target used as part of the test to see if make supports
|
# A simple test target used as part of the test to see if make supports
|
||||||
# the -m argument.
|
# the -m argument. Also test that make will only evaluate a conditional
|
||||||
|
# as far as is necessary to determine its value.
|
||||||
#
|
#
|
||||||
test:
|
test:
|
||||||
|
.if defined(notdef)
|
||||||
|
.undef notdef
|
||||||
|
.if defined(notdef) && ${notdef:U}
|
||||||
|
.endif
|
||||||
|
.endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# Upgrade the installed make to the current version using the installed
|
# Upgrade the installed make to the current version using the installed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user