CVS commit: src/usr.bin/make

["Simon J. Gerraty" <sjg%netbsd.org@localhost>]

Module Name:    src
Committed By:   sjg
Date:           Tue Feb 10 18:53:34 UTC 2026

Modified Files:
        src/usr.bin/make: job.c job.h make.c make.h meta.c parse.c
        src/usr.bin/make/unit-tests: Makefile gnode-submake.exp
            gnode-submake.mk opt-jobs-internal.exp opt-jobs-internal.mk
            varname-make_stack_trace.exp varname-make_stack_trace.mk

Log Message:
make: move MaybeSubMake to job.c

Simplify MaybeSubMake to work on the expanded command from
JobWriteCommand, we check for progname sans any "[level]".

This improves reliability and reduces overhead as we only
scan commands that will actually be run - in jobs mode.

In meta_oodate we need to know of OP_SUBMAKE when deciding if
a .meta file is needed or not - and therefor needs checking.
This obviously happens before JobWriteCommand is called, so we may
have to check MaybeSubMake from meta_needed. If so, we set a flag
doneSubmake so JobWriteCommand will not recheck.

Tweak the few unit-tests that are impacted.
In particular; we have to use a symlink .make -> ${MAKE} to be able
to defeat MaybeSubMake and trigger warnings about bogus -J args.

Reviewed by: rillig


To generate a diff of this commit:
cvs rdiff -u -r1.519 -r1.520 src/usr.bin/make/job.c
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/make/job.h
cvs rdiff -u -r1.273 -r1.274 src/usr.bin/make/make.c
cvs rdiff -u -r1.363 -r1.364 src/usr.bin/make/make.h
cvs rdiff -u -r1.219 -r1.220 src/usr.bin/make/meta.c
cvs rdiff -u -r1.754 -r1.755 src/usr.bin/make/parse.c
cvs rdiff -u -r1.376 -r1.377 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/gnode-submake.exp
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/gnode-submake.mk
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/opt-jobs-internal.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-jobs-internal.mk
cvs rdiff -u -r1.4 -r1.5 \
    src/usr.bin/make/unit-tests/varname-make_stack_trace.exp \
    src/usr.bin/make/unit-tests/varname-make_stack_trace.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.