From nobody Sat Mar 09 02:01:45 2024 X-Original-To: dev-commits-src-all@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 4Ts5rB0yDkz5CZ8n; Sat, 9 Mar 2024 02:01:46 +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 4Ts5rB0Gf4z4Yy3; Sat, 9 Mar 2024 02:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709949706; 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=Ltwkh+jN9rfoTRW67m90UNpxfjCbm2bsD5ynd0o/aAM=; b=xF8pDJOc/V443vChnV68uc9KL/BXyG2msHeDSrEaNdYqwAbb260yS/gbxdtEqN4/zayT/+ 2Hp+6s8RYzYIhGcKWEk4nKRFv4GqD0zaqlS37aisA2LytAYqyEh4skXsdmjmIbyNW+VB65 bMI6DBzj4RXMIel8KurOloIs/iDcRGE6Q+EeLzY426M8kjunSTBsC+mLmVO20pM1YCAC5h Np+Dd506RPmxmoRGsqcNStH6LD6wtWIbW0ytphJLESM6R4MpGtmBK3ZhpiRL2TQtKNnAuj yT0xzsg/N2unA1vs96hzV6NgPTA124/CgBBNRzKGOR79bo/XQD236d7wHaJCew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709949706; a=rsa-sha256; cv=none; b=Fg/bxchpMwwoJjS3bFaTliAkbXWjPK3XFXhK5BL2BUdhClhimUfzggBKEjsy2S13XnpizO 4hflCYgOxh8auKTrjv7KpPZ+OJkUH/fgV8hRNTEcpJnNfdTobKVg5ZCieJ60Tlnq+iWLaW J+Onh7DXaXCTK4rbI/nlRW+vQnFSox/MEOWwuPKsRbAG0HJ2xUWK8t/ROzUrD+e3sHj24s RJTHC6OzazNcgOBRMZYVwmUy+G/oad58T6wPLzqV7z7waB1SD6OcOvtfi5tTEVT5c7uZpv /42zbJkmnIc86Op0frco8S1stcYp7KYSsSTYxt1gmLk9RorE/kRh6anlYsZnDg== 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=1709949706; 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=Ltwkh+jN9rfoTRW67m90UNpxfjCbm2bsD5ynd0o/aAM=; b=L16bZMQQTaKuYAPG5qX/GK4EkY68ZOP69rG/Sg/Wz0f2lcHzAkiD7nzXKCW5z6I8+EWCke sM9d+JCRZ7JybRZTy06dhVrsXknblNOhlfdEbMBIjAiCk2mrZkL6BEAM9C8L1RmG65+Opi nhI9VEkb9OfwaIvi6+pfRRdMtQWDyOn+D3uHVAyxZuShO6Tv3z6He4t0nIIq0gMGkqGC01 NSSdTzpVMi9RTZPkupr3JuAKb55PRSyq7ulD9+UeoMRfNlM8i1RXhuCUFwciOfsFH3M7uR 1Ayi0IvsLbLJSapkOqM3BHLSy8o1/V+gYtDXZolXqzERaww0oiF1CtL26A88XA== 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 4Ts5r970Lfzk4c; Sat, 9 Mar 2024 02:01:45 +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 42921j13061414; Sat, 9 Mar 2024 02:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42921j6Q061411; Sat, 9 Mar 2024 02:01:45 GMT (envelope-from git) Date: Sat, 9 Mar 2024 02:01:45 GMT Message-Id: <202403090201.42921j6Q061411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 6e2cfb24ee87 - main - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6e2cfb24ee87fec0f538d04cd69d76a8d58c324f commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-09 02:01:25 +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 Differential Revision: https://reviews.freebsd.org/D43869 --- 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 41713849b27b..1deb2bb2f7ea 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1114,8 +1114,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);