Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"
MIME-Version: 1.0
Date: Sat, 29 Jan 2022 10:19:49 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: src/usr.bin/make
To: source-changes@NetBSD.org
Message-Id: <20220129101949.65DD6FB24@cvs.NetBSD.org>
Sender: source-changes-owner@NetBSD.org
Precedence: bulk
Reply-To: source-changes-d@NetBSD.org
Mail-Reply-To: "Roland Illig" <rillig@netbsd.org>
Mail-Followup-To: source-changes-d@NetBSD.org

Module Name:	src
Committed By:	rillig
Date:		Sat Jan 29 10:19:49 UTC 2022

Modified Files:
	src/usr.bin/make: make.h parse.c var.c
	src/usr.bin/make/unit-tests: var-recursive.exp

Log Message:
make: for recursive variables in commands, print location

Print the approximate location based on the last command that has been
defined for the target.  It would be possible to get more detailed
location information by counting the number of commands of the target,
but that would get messy due to .USEBEFORE, .USE and .DEFAULT, and
still, this is an edge case, so don't waste too much code for it now.
Having this hint about the location is more helpful than just a plain
"Variable X is recursive" without any further details.


To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/usr.bin/make/make.h
cvs rdiff -u -r1.659 -r1.660 src/usr.bin/make/parse.c
cvs rdiff -u -r1.1007 -r1.1008 src/usr.bin/make/var.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/var-recursive.exp

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