Module Name: src
Committed By: rillig
Date: Tue Jan 14 21:39:25 UTC 2025
Modified Files:
src/usr.bin/make: suff.c
src/usr.bin/make/unit-tests: suff.exp suff.mk
Log Message:
make: clarify that undefined expressions are allowed in dependencies
To generate a diff of this commit:
cvs rdiff -u -r1.382 -r1.383 src/usr.bin/make/suff.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/suff.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/suff.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/suff.c
diff -u src/usr.bin/make/suff.c:1.382 src/usr.bin/make/suff.c:1.383
--- src/usr.bin/make/suff.c:1.382 Sun Jul 7 07:50:57 2024
+++ src/usr.bin/make/suff.c Tue Jan 14 21:39:24 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: suff.c,v 1.382 2024/07/07 07:50:57 rillig Exp $ */
+/* $NetBSD: suff.c,v 1.383 2025/01/14 21:39:24 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -115,7 +115,7 @@
#include "dir.h"
/* "@(#)suff.c 8.4 (Berkeley) 3/21/94" */
-MAKE_RCSID("$NetBSD: suff.c,v 1.382 2024/07/07 07:50:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: suff.c,v 1.383 2025/01/14 21:39:24 rillig Exp $");
typedef List SuffixList;
typedef ListNode SuffixListNode;
@@ -1343,7 +1343,7 @@ ExpandChildren(GNodeListNode *cln, GNode
}
DEBUG1(SUFF, "Expanding \"%s\"...", cgn->name);
- expanded = Var_Subst(cgn->name, pgn, VARE_EVAL_DEFINED);
+ expanded = Var_Subst(cgn->name, pgn, VARE_EVAL);
/* TODO: handle errors */
{
Index: src/usr.bin/make/unit-tests/suff.exp
diff -u src/usr.bin/make/unit-tests/suff.exp:1.3 src/usr.bin/make/unit-tests/suff.exp:1.4
--- src/usr.bin/make/unit-tests/suff.exp:1.3 Tue Jan 14 21:23:17 2025
+++ src/usr.bin/make/unit-tests/suff.exp Tue Jan 14 21:39:25 2025
@@ -51,8 +51,8 @@ SuffFindDeps "edge-case.to"
trying edge-case.from...got it
edge-case.to: @ = edge-case.to
edge-case.to: * = edge-case
-Expanding "${.PREFIX}${.ARCHIVE}.additional"...Var_Parse: ${.PREFIX}${.ARCHIVE}.additional (eval-defined)
-Var_Parse: ${.ARCHIVE}.additional (eval-defined)
+Expanding "${.PREFIX}${.ARCHIVE}.additional"...Var_Parse: ${.PREFIX}${.ARCHIVE}.additional (eval)
+Var_Parse: ${.ARCHIVE}.additional (eval)
edge-case.additional...
applying .from -> .to to "edge-case.to"
everything: @ = everything
Index: src/usr.bin/make/unit-tests/suff.mk
diff -u src/usr.bin/make/unit-tests/suff.mk:1.2 src/usr.bin/make/unit-tests/suff.mk:1.3
--- src/usr.bin/make/unit-tests/suff.mk:1.2 Sun Jan 12 23:10:30 2025
+++ src/usr.bin/make/unit-tests/suff.mk Tue Jan 14 21:39:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: suff.mk,v 1.2 2025/01/12 23:10:30 rillig Exp $
+# $NetBSD: suff.mk,v 1.3 2025/01/14 21:39:25 rillig Exp $
#
# Demonstrate suffix rules and dependency resolution.
@@ -30,7 +30,7 @@ step1: .PHONY edge-case.to everything
: Making ${.TARGET} from ${.ALLSRC}.
# When making this target, ${.ARCHIVE} is undefined, but there's no warning.
-# expect: Var_Parse: ${.ARCHIVE}.additional (eval-defined)
+# expect: Var_Parse: ${.ARCHIVE}.additional (eval)
edge-case.to: ${.PREFIX}${.ARCHIVE}.additional
edge-case.from edge-case.additional:
