Module Name: src
Committed By: sjg
Date: Sun Jan 16 18:16:07 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: varname-makeflags.mk
Log Message:
Ensure make gets -r
Apart from ensuring no influence from /usr/share/mk
when bmake is built for the first time on a non-BSD
system, sys.mk will not be found
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varname-makeflags.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/varname-makeflags.mk
diff -u src/usr.bin/make/unit-tests/varname-makeflags.mk:1.4 src/usr.bin/make/unit-tests/varname-makeflags.mk:1.5
--- src/usr.bin/make/unit-tests/varname-makeflags.mk:1.4 Mon Dec 27 20:17:35 2021
+++ src/usr.bin/make/unit-tests/varname-makeflags.mk Sun Jan 16 18:16:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: varname-makeflags.mk,v 1.4 2021/12/27 20:17:35 rillig Exp $
+# $NetBSD: varname-makeflags.mk,v 1.5 2022/01/16 18:16:06 sjg Exp $
#
# Tests for the special MAKEFLAGS variable, which is basically just a normal
# environment variable. It is closely related to .MAKEFLAGS but captures the
@@ -35,8 +35,8 @@ OUTPUT!= env MAKEFLAGS=ikrs ${MAKE} -f /
# variable MAKEFLAGS, it is no longer split. In this example, the word
# "d0ikrs" is treated as a target, but the option '-v' prevents any targets
# from being built.
-OUTPUT!= env MAKEFLAGS=d0ikrs ${MAKE} -f /dev/null -v .MAKEFLAGS
-.if ${OUTPUT} != " -V .MAKEFLAGS"
+OUTPUT!= env MAKEFLAGS=d0ikrs ${MAKE} -r -f /dev/null -v .MAKEFLAGS
+.if ${OUTPUT} != " -r -V .MAKEFLAGS"
. error ${OUTPUT}
.endif