Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.bin/make make: skip strdup when parsing an irrelevant ':...



details:   https://anonhg.NetBSD.org/src/rev/e45502ae3382
branches:  trunk
changeset: 960323:e45502ae3382
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Mar 14 18:10:57 2021 +0000

description:
make: skip strdup when parsing an irrelevant ':L' modifier

No functional change.

diffstat:

 usr.bin/make/var.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r d226c930ce00 -r e45502ae3382 usr.bin/make/var.c
--- a/usr.bin/make/var.c        Sun Mar 14 18:08:25 2021 +0000
+++ b/usr.bin/make/var.c        Sun Mar 14 18:10:57 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: var.c,v 1.871 2021/03/14 18:08:25 rillig Exp $ */
+/*     $NetBSD: var.c,v 1.872 2021/03/14 18:10:57 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.871 2021/03/14 18:08:25 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.872 2021/03/14 18:10:57 rillig Exp $");
 
 typedef enum VarFlags {
        VFL_NONE        = 0,
@@ -2518,8 +2518,10 @@
 
        (*pp)++;
 
-       Expr_Define(expr);
-       Expr_SetValueOwn(expr, bmake_strdup(expr->var->name.str));
+       if (expr->eflags & VARE_WANTRES) {
+               Expr_Define(expr);
+               Expr_SetValueOwn(expr, bmake_strdup(expr->var->name.str));
+       }
 
        return AMR_OK;
 }



Home | Main Index | Thread Index | Old Index