Module Name: src
Committed By: rillig
Date: Fri Dec 3 23:37:30 UTC 2021
Modified Files:
src/usr.bin/make: parse.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.567 -r1.568 src/usr.bin/make/parse.c
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/parse.c
diff -u src/usr.bin/make/parse.c:1.567 src/usr.bin/make/parse.c:1.568
--- src/usr.bin/make/parse.c:1.567 Fri Dec 3 23:29:30 2021
+++ src/usr.bin/make/parse.c Fri Dec 3 23:37:30 2021
@@ -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 @@ SetFilenameVars(const char *filename, co
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);
