[src/trunk]: src/usr.bin/make make: do not try to expand fixed variable names

[rillig <rillig%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/73f38033cb57
branches:  trunk
changeset: 1026645:73f38033cb57
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Dec 03 23:37:30 2021 +0000

description:
make: do not try to expand fixed variable names

The function SetFilenameVars is only called with fixed variable names,
none of which contains a '$', so take a shortcut.

No functional change.

diffstat:

 usr.bin/make/parse.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r ac1ea26eb309 -r 73f38033cb57 usr.bin/make/parse.c
--- a/usr.bin/make/parse.c      Fri Dec 03 23:29:30 2021 +0000
+++ b/usr.bin/make/parse.c      Fri Dec 03 23:37:30 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.c,v 1.567 2021/12/03 23:29:30 rillig Exp $       */
+/*     $NetBSD: parse.c,v 1.568 2021/12/03 23:37:30 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.567 2021/12/03 23:29:30 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.568 2021/12/03 23:37:30 rillig Exp $");
 
 /* types and constants */
 
@@ -2299,8 +2299,8 @@
                basename = slash + 1;
        }
 
-       Global_SetExpand(dirvar, dirname.str);
-       Global_SetExpand(filevar, basename);
+       Global_Set(dirvar, dirname.str);
+       Global_Set(filevar, basename);
 
        DEBUG5(PARSE, "%s: ${%s} = `%s' ${%s} = `%s'\n",
            __func__, dirvar, dirname.str, filevar, basename);