From nobody Wed Oct 16 16:27:13 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 4XTGZn4YDdz5YjnB; Wed, 16 Oct 2024 16:27:13 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTGZn3nkSz4hLd; Wed, 16 Oct 2024 16:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729096033; 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=JxAby9raU4ix8IxrZ4OvflMLoY9D9JQYcPYQef6V9bc=; b=gKTmrhCcMzouvBodBdWCVyYR7dVnQSpOKVJMpHnhlF8s9v6/cjkXxSEvdZFXASL69MKIxA oN6bZCttzl7VNpaK2R02i072gRCENvvpIAA7KnH6lTyC0RKSO+ct0tkK/CwFitB+HrWX7I +LpVJ//mIuhyT1uoJVvAuOdHrRZrIuNIerqgZPxl6frXqC1UNv9iY2QZnQx5WT508vhU0q kQyazEFVIC6Jsb3Or6cfRS8KEMZXpEGR+6hiBjVp96sTfelhVz9UPclvGXP85ev9KIjkDz gdL4uc2se7Oq2XLAaOROlhd7ZXDWmmkvy5jTQ5kmI9bSk9yw89PmS8aBGCqdXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729096033; 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=JxAby9raU4ix8IxrZ4OvflMLoY9D9JQYcPYQef6V9bc=; b=YW3lmK4r0F8d9aB5w+cTLhzwPxPGxib5r0gzWoMHY4yv7tXiHKRJicsnpMjjJznm4jAvru 62VoYccwA4L+O9XYbYljROM9esIyazpIVHtwdXXK/WxO/2cW3vDdt22U7KMbDg4OllWSfv mwAtjZWZ7RlzC5UCQi+g9k0O+ggzrSyfm0aR1AYx3bbyswRyedF5OUAruvBZkS5KaNY3uS DW/9lw8A/Y6ImhEmPS+PVbeE0WLxMj9naWYdBegFQHbKLQS5YpqUSKFreXMI2xsk1zVqfb uSMPIu6Wg9WkDIRC7HuiUa8nkpqNBWzrW422N6dUCuWr1eBjAz3W77l/ZwStAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729096033; a=rsa-sha256; cv=none; b=dwxIMLudcoDPFaRdXOgRhpyD8Pcw+ukey8wjNb0saoPU1ko4DHiFoPK+X52qU3uFUD5tyh H2hgHKWs9IrKCWj68CiLIM6TQlWh3bc6TGp0/4rQYcbJ6RFL49iYilXLDpNsQI1gl7uulN AZ9whhdEBqdPbPKZk6JIo9PD+JlkoT5lMEqtS54mINH4C1QZC9mfu+I3G/IfctAaLm4Apl csSOD7fTMpl5DIJh2OluJdvljGh/0DqlAme2jJzBWLCwX+QgyxGRvRkTfegTLHsCbE/z2B pZcITpytxMs64DeF7QHEKBBCw5IGYdb2BbtQ+56VNjGVQGZTlA9XbC6iOkcRRw== 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 4XTGZn3P29z1Cdq; Wed, 16 Oct 2024 16:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49GGRDcp077148; Wed, 16 Oct 2024 16:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49GGRD8B077145; Wed, 16 Oct 2024 16:27:13 GMT (envelope-from git) Date: Wed, 16 Oct 2024 16:27:13 GMT Message-Id: <202410161627.49GGRD8B077145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: c5c0e79bb0ad - main - Add local.meta.stage.mk 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5c0e79bb0ad0a1b9b9688aaf919826c4c386411 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c5c0e79bb0ad0a1b9b9688aaf919826c4c386411 commit c5c0e79bb0ad0a1b9b9688aaf919826c4c386411 Author: Simon J. Gerraty AuthorDate: 2024-10-16 16:25:16 +0000 Commit: Simon J. Gerraty CommitDate: 2024-10-16 16:26:29 +0000 Add local.meta.stage.mk We need to undo NO_OBJ if we are staging as it causes us to drop the stage* target cookies in src tree which is bad, and may break doing the same targets for multiple architectures. Reviewed by: stevek --- share/mk/local.meta.stage.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/mk/local.meta.stage.mk b/share/mk/local.meta.stage.mk new file mode 100644 index 000000000000..8a59631e57ae --- /dev/null +++ b/share/mk/local.meta.stage.mk @@ -0,0 +1,6 @@ +.if defined(NO_OBJ) && ${__objdir:U${.CURDIR}} != ${.CURDIR} +# NO_OBJ would cause us to dribble stage* into .CURDIR +# which will prevent the targets being done for multiple MACHINES +.undef NO_OBJ +.OBJDIR: ${__objdir} +.endif