From nobody Mon Mar 18 15:53:24 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tyzsd0Ds3z5Dyd8; Mon, 18 Mar 2024 15:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tyzsc5xGwz4cnK; Mon, 18 Mar 2024 15:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtYW7qDic2/EI3/el1QjXyu2PBHl71svyKS5jFjDyvk=; b=rQTZ9fyjjPsOqOe+5JwpTZK63nhw1MLo7T4IGFqRhnEqRKDNbCM7yLwLnFkPWngsD4+iDR MyOJrK6tK6XD/PqgwgQ1cRfDIC585yUIRzlNBbggxj4s2UbwjNqEcxi9NXAP14CocaFRcB vXEwTqeuxDFJ6JPEwkrFsJ6UIEGzSNv1YwvNg5JEXdXVDccLtJCUw8Mrs/Dloe6Lv3/edo VMs3VClumO0h+Q2HcW1Uo5lOFJR6XWe/K7OBsvXuftuFFKscBVCRIzfE1sugFMKzfQBNFf GnYMV2sJFXNiLDKQ1eJijt+yxPcoaPpPTu8n386ZdkmUuY2ln8jcpr2VemDT3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710777204; a=rsa-sha256; cv=none; b=fHQEQfKV7n7j2GN7KdfJGgUXgX3i9ZLBARibQQm5Ie11ePBx1fHig5N9OvAOxFgH50Z7X4 nLBA5tY4yLsx0QSdwT45X4yjzY8RKWZ1oWVWffwAOTCdrF+qFg8ONwXiGWNb6srLk5a4Al rs8UHwPAi7FZyBdTFflQzbR3t691cxdWBonxA7PZTA2sd1Z/L/Jk5xFxsfrGzavvxeTrow NcxGzmfLIrHMdmKElqvcaRpq2/r4ZgEnOth29R6QTEA0fJ5IVebI053a+L0JoN1/hQ/rvT 5VicGZMtb/FCrcWwBhl5AeBnnclLMXGXPzc7rwhTT1Tr7shSMv3wbXOlNg8o4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710777204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtYW7qDic2/EI3/el1QjXyu2PBHl71svyKS5jFjDyvk=; b=bR+RJFq0Jb7r/W2A99BUUjuZ0PZ0wXadpQGQOfbJCyb6Ep7xmRhCBSlnpEfBcjOaAHI+YM k1soa9qh+UcC319pbWSJ1MC39YOKZE2DCmYh6IvEuBC19SlC+q/RtVsV+l9ETwcA6Hx/wm YSxMZrM7uNkEmU7JT+9D5cvShKKjuojn2+0e6kOb0JeYd+QE6538wdoViUW5SLQnjdjqIb vbeQTjogK7pSPb3wMqqPEAR5HQ/ILQiJ0gdc4CL5vk/Je/V/e65EY1lvqHthQcSrDs7Y1y gA9xZSb4Wh6ms/nhYdDh/gY16TSqLqheNZOp9jo3ekEb3uKyFPUyyXORZvutEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tyzsc3VYMzSyN; Mon, 18 Mar 2024 15:53:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42IFrOtp001456; Mon, 18 Mar 2024 15:53:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42IFrOCK001453; Mon, 18 Mar 2024 15:53:24 GMT (envelope-from git) Date: Mon, 18 Mar 2024 15:53:24 GMT Message-Id: <202403181553.42IFrOCK001453@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 97bfe58ddc60 - stable/14 - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 commit 97bfe58ddc60e258164f1fa82df9ef954ae7cdf5 Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 15:52:59 +0000 crunchgen: slap a dependency on the generated makefile for .lo crunchgen generates a foo.lo for each binary it will end up crunching into the final product. While they have a dependency on the libs that are used to link them, nothing will force relinking if the set of libs needed to link them is changed. Because of this, incremental builds may not be possible if one builds a version of, e.g., rescue/ with a broken set of libs specified for a project -- a subsequent fix won't be rolled in cleanly, it will require purging the rescue/ objdir. This is a bit crude, but the foo.mk we generate doesn't actually get regenerated all that often in practice, so a spurious relink for the vast majority of crunched objects won't actually happen all that often. Reviewed by: bapt, emaste, imp (cherry picked from commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f) --- usr.sbin/crunch/crunchgen/crunchgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 7b5f892cffbe..996db29dee8e 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1115,8 +1115,8 @@ prog_makefile_rules(FILE *outmk, prog_t *p) "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->ident, p->name); - fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)", - p->name, p->name, p->ident); + fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS) %s", + p->name, p->name, p->ident, outmkname); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident);