summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/build/make_check/Makefile23
1 files changed, 21 insertions, 2 deletions
diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile
index 346b4bb..3a0f6ad 100644
--- a/tools/build/make_check/Makefile
+++ b/tools/build/make_check/Makefile
@@ -56,8 +56,10 @@ all:
@echo "ok 14 shell # Test shell detected no regression."
@${SMAKE} shell_1 || ${SMAKE} failure
@echo "ok 15 shell_1 # Test shell_1 detected no regression."
+.if !defined(.PARSEDIR)
@${SMAKE} shell_2 || ${SMAKE} failure
@echo "ok 16 shell_2 # Test shell_2 detected no regression."
+.endif
.if make(C_check)
C_check:
@@ -92,17 +94,34 @@ lhs_expn:
# to determine its value; that was not always the case.
.undef notdef
notdef:
-.if defined(notdef) && ${notdef:U}
+.if defined(notdef) && ${notdef:M/}
.endif
.endif
.if make(modifiers)
-# See if make(1) supports the C modifier.
+.if defined(.PARSEDIR)
+# check if bmake can expand plain variables
+.MAKE.EXPAND_VARIABLES= yes
+x!= ${SMAKE} -V .CURDIR:H
modifiers:
+.if ${.CURDIR:H} != "$x"
+ @false
+.endif
+.else
+# See if make(1) supports the C modifier.
+modifiers: dollarV
@if ${SMAKE} -V .CURDIR:C/.// 2>&1 >/dev/null | \
grep -q "Unknown modifier 'C'"; then \
false; \
fi
+
+# check that make -V '${VAR}' works
+V_expn != V_OK=ok ${SMAKE} -r -f /dev/null -V '$${V_OK}'
+dollarV:
+.if ${V_expn} == ""
+ @false
+.endif
+.endif
.endif
.if make(arith_expr)
OpenPOWER on IntegriCloud