Re: bin/60016 (make(1) tests failing since sjg MaybeSubMake changes)

["Simon J. Gerraty via gnats" <gnats-admin%NetBSD.org@localhost>]

The following reply was made to PR bin/60016; it has been noted by GNATS.

From: "Simon J. Gerraty" <sjg%juniper.net@localhost>
To: Christos Zoulas <christos%zoulas.com@localhost>
Cc: <gnats-bugs%netbsd.org@localhost>, <gnats-admin%netbsd.org@localhost>,
        <netbsd-bugs%netbsd.org@localhost>, <campbell+netbsd%mumble.net@localhost>,
        "rillig%netbsd.org@localhost"
	<rillig%netbsd.org@localhost>, <sjg%juniper.net@localhost>
Subject: Re: bin/60016 (make(1) tests failing since sjg MaybeSubMake changes)
Date: Sat, 28 Feb 2026 16:03:27 -0800

 I have:
 
 --------------------8<--------------------
 MaybeSubMake: ignore line beining with any of [@+-]
 
 When checking if 'make' (progname actually) matches the start of the
 line, we want to ignore any initial [ @+-]
 
 PR: 60016
 Reviewed by:
 --------------------8<--------------------
 Index: job.c
 ===================================================================
 RCS file: /cvsroot/src/usr.bin/make/job.c,v
 retrieving revision 1.522
 diff -u -p -r1.522 job.c
 --- job.c	16 Feb 2026 17:57:38 -0000	1.522
 +++ job.c	1 Mar 2026 00:00:18 -0000
 @@ -974,6 +974,7 @@ MaybeSubMake(const char *cmd)
  		make[strcspn(make, "[")] = '\0';
  		len = strlen(make);
  	}
 +	cmd += strspn(cmd, "@ \t+-");
  	for (p = strstr(cmd, make); p != NULL; p = strstr(&p[1], make)) {
  		if (p == cmd || p[-1] == '/' || ch_isspace(p[-1])) {
  			if (p[len] == '\0' || ch_isspace(p[len])) {