Source-Changes-HG archive

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

[src/trunk]: src/usr.bin/make Use .MAKE.DEPENDFILE as makefiles set it



details:   https://anonhg.NetBSD.org/src/rev/ad7467216f0f
branches:  trunk
changeset: 958130:ad7467216f0f
user:      sjg <sjg%NetBSD.org@localhost>
date:      Sat Dec 26 03:54:48 2020 +0000

description:
Use .MAKE.DEPENDFILE as makefiles set it

diffstat:

 usr.bin/make/main.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r 134c90679128 -r ad7467216f0f usr.bin/make/main.c
--- a/usr.bin/make/main.c       Sat Dec 26 00:55:26 2020 +0000
+++ b/usr.bin/make/main.c       Sat Dec 26 03:54:48 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.502 2020/12/23 14:13:49 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.503 2020/12/26 03:54:48 sjg Exp $   */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -109,7 +109,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.502 2020/12/23 14:13:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.503 2020/12/26 03:54:48 sjg Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -1532,8 +1532,7 @@
 {
        /* In particular suppress .depend for '-r -V .OBJDIR -f /dev/null' */
        if (!opts.noBuiltins || opts.printVars == PVM_NONE) {
-               /* ignore /dev/null and anything starting with "no" */
-               (void)Var_Subst("${.MAKE.DEPENDFILE:N/dev/null:Nno*:T}",
+               (void)Var_Subst("${.MAKE.DEPENDFILE}",
                    VAR_CMDLINE, VARE_WANTRES, &makeDependfile);
                if (makeDependfile[0] != '\0') {
                        /* TODO: handle errors */



Home | Main Index | Thread Index | Old Index