From cdc50a22f04eeeb150e1dc17e8e85c4e1ee8d455 Mon Sep 17 00:00:00 2001 From: rillig Date: Wed, 3 Feb 2021 13:44:39 +0000 Subject: make: split Var_Append into Var_Append and Var_AppendExpand The plain Var_Append now does not expand the variable name anymore. It is used in situations where the variable name is known to not contain a dollar sign. This is a preparation for adding Global_Append, corresponding to Global_AppendExpand. --- usr.bin/make/parse.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.bin/make/parse.c') diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index a56be04eea8..00d0de1a6e0 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -1,4 +1,4 @@ -/* $NetBSD: parse.c,v 1.540 2021/02/03 08:08:18 rillig Exp $ */ +/* $NetBSD: parse.c,v 1.541 2021/02/03 13:44:39 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -109,7 +109,7 @@ #include "pathnames.h" /* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: parse.c,v 1.540 2021/02/03 08:08:18 rillig Exp $"); +MAKE_RCSID("$NetBSD: parse.c,v 1.541 2021/02/03 13:44:39 rillig Exp $"); /* types and constants */ @@ -1954,7 +1954,7 @@ VarAssign_Eval(const char *name, VarAssignOp op, const char *uvalue, FStr avalue = FStr_InitRefer(uvalue); if (op == VAR_APPEND) - Var_Append(name, uvalue, ctxt); + Var_AppendExpand(name, uvalue, ctxt); else if (op == VAR_SUBST) VarAssign_EvalSubst(name, uvalue, ctxt, &avalue); else if (op == VAR_SHELL) -- cgit