Module Name: src
Committed By: rillig
Date: Sun Mar 14 20:09:26 UTC 2021
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: in parse-only mode, do not update the expression value in ':sh'
No functional change outside debug mode. The other variable modifiers
behave in the same way.
To generate a diff of this commit:
cvs rdiff -u -r1.879 -r1.880 src/usr.bin/make/var.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/var.c
diff -u src/usr.bin/make/var.c:1.879 src/usr.bin/make/var.c:1.880
--- src/usr.bin/make/var.c:1.879 Sun Mar 14 20:03:56 2021
+++ src/usr.bin/make/var.c Sun Mar 14 20:09:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.879 2021/03/14 20:03:56 rillig Exp $ */
+/* $NetBSD: var.c,v 1.880 2021/03/14 20:09:26 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.879 2021/03/14 20:03:56 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.880 2021/03/14 20:09:26 rillig Exp $");
typedef enum VarFlags {
VFL_NONE = 0,
@@ -3586,15 +3586,6 @@ ApplyModifier_SunShell(const char **pp,
if (errfmt != NULL)
Error(errfmt, expr->value.str);
Expr_SetValueOwn(expr, output);
- } else {
- /*
- * TODO: Check whether returning ":sh" would be
- * more consistent with the other modifiers.
- *
- * TODO: Add a unit test demonstrating that the
- * actual value of this expression has any effect.
- */
- Expr_SetValueRefer(expr, "");
}
return AMR_OK;
