From nobody Mon Mar 18 03:40:51 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 4TygcM5d3Vz5FV3C; Mon, 18 Mar 2024 03:40:51 +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 4TygcM4yVyz456t; Mon, 18 Mar 2024 03:40:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710733251; 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=vTAJVlU0Z/xueghadfLTJUxCINfEFFV4fJf/+Gnpxf8=; b=oUtmM2IWs1bQcEZLZTE6LASqRngPv7mxZslUcaG2alEYT4SPdpGLbgSNCfMhsdkK7MN1+l 3iiMHndzp9TEnC6Sd5oIXskczxn/J6sXItib7HATEKovCWK0p07D0PkF7s4vELqtlgSwnO bfDqF0RRtO+JL0oSfEbM1r5t/m2qe9sFChRbDvHjQTzAAb6wHoB7QTkSkBK2T7tBKwZYb2 URuAgCfK5h570htdtmb0cQ4jMKhaECO/aIk0ujMsIVtQ8DeZAEHs6+8jV0tDIjv6Xaq+pO z2CDQp96xzkQUnX33nhfWwGYaB5Tq6eIBAoqLepBOqKcYzrH6zFhLS4A6xzJcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710733251; a=rsa-sha256; cv=none; b=dReQ7SlVwwx7qB9TESM3YHDMxzDdyFZ4P2VKQg5oPh4utXUcV+Fb7I/2oq9Zx2fFgiGIFM WATxyF4q+o6kpIo3v4eu6BRSVR7f3E+qNuYjcwP6AinxkEhneY9hNhW6C1AJIUZHy/go4X Boal+LASJsgbPIvLXOI2Uj/xbUDtfQcH7eWt8RNT+t7X6aNwiiRipVsDqgZfJhpAFBRjGR 6IcRZrCf/sQTpX+NyB1lBQnFS+g1KlLdJ9DBvQXIbHPCxsJJE1+lEy3Z+suNr3DwRWlggu VeylK8xRUuizqqoKnGS3UfgDR9eollrLN91iq6IjN+TjB7J4RqxPchrlH+wGYA== 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=1710733251; 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=vTAJVlU0Z/xueghadfLTJUxCINfEFFV4fJf/+Gnpxf8=; b=l+iPnqfPTPVuFJuwvEu/TZTlBJkr38NkGB7K4nUmmbwY1ipWKW3sB6fifu/q+gWVlEg4zo tUy40/Rghv2SCPKnet9YN7M9+CLLu4B+RFZ8ohqbNx1cfcrqJCJqFafQKuAHdEt9CGVIzH 690+OsW4+jpYIB0ZXF0MTE1Tn6QmbIHxLefvxTrt3uQkWLDLMUkvIMBOOrfHcxlaLFLOsM Gj+bF6w4+yBanKrsvObRaApyf+dugnlHLQfgkWsUIsI+ncCI6sYG37X9aSalPNrGdEcKd1 Na0h2JvXMaHjl1NsaF2yl8ydin6Hl4YikQEXwQW7L28yvfTrMdbL047qIimvUA== 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 4TygcM4Z75z15cg; Mon, 18 Mar 2024 03:40:51 +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 42I3epVZ057632; Mon, 18 Mar 2024 03:40:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42I3epXH057618; Mon, 18 Mar 2024 03:40:51 GMT (envelope-from git) Date: Mon, 18 Mar 2024 03:40:51 GMT Message-Id: <202403180340.42I3epXH057618@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: 79a095fa8a66 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 79a095fa8a66a55e21d75c540a56249718d4eb73 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=79a095fa8a66a55e21d75c540a56249718d4eb73 commit 79a095fa8a66a55e21d75c540a56249718d4eb73 Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-18 03:34:09 +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 2315b139b8b6..31d64e8ab676 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1129,8 +1129,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);