From nobody Sun Jun 02 23:35:51 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 4VstX80gc1z5LTqg; Sun, 02 Jun 2024 23:35:52 +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 4VstX75vzdz47Yn; Sun, 2 Jun 2024 23:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717371351; 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=u1/lTTmm+Om2xDhTin5hj3A1mDmZ5ZKH1jAcSNKbSmc=; b=CxXQeJZtKmzCx9Iextjnz8FWPh2kwrdvuc3aAsEKe2sGlWx+goWldC2mxpbTwpBh6aAZUu cHpWaOoCgiwI/E2Xii2qmGvfSpYPnvt0O/f1fboEAOIrSgnMTILMxVX9zu6s1jaItR6PjS 0H2YAAlMdqTvcBhkOZ2+p772EluY6LO/KLLnhMU3hRsp2rgS0Ww8veQuGS9dogUvmA6mWE fMWQKutlpRpc1P/3rJLNmvwi83LIEU2Vl6E1hWa8iBL36qXvtPZjR8bk4nCTzMNbuzsiqa iDhwcrcfiuNKDrL9EcRCBcfd/rilfaOTN16tA/USMWgDXul0adAtkkxDJQ7GjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717371351; a=rsa-sha256; cv=none; b=rJxH6g0gP8A+BeqgoRmv1xglhy0TfWLpw3nWStOvw4QDd13E+p6j8PolNUXneoASyHFm40 jq0qWlVByg7D50sMkWzk0CcG5S1USf4oYInTOoHTU+aplWtjL8Abva1osw2v+LqszSFoZU EcDOYQhMabJhD/MVYROK3YKcrolBT+ZJXBxJzU5RczxQ54gPI8GPzxvnJAKdjH6hLTot1D xO9QAmR4udS7UC73SqrnOIVRhkdMp678ZpuJAi3mnmsq7Q/E9opRxerqQ7PmRA6twNNutR 0UpOseXu38TC+bBl4LAd3oyI17LP7ge1FP/VZInBtu8f3ab7z1UF+S/59Cr6XA== 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=1717371351; 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=u1/lTTmm+Om2xDhTin5hj3A1mDmZ5ZKH1jAcSNKbSmc=; b=Nxwfm38SXrxqZ/9SOI4j/Cjob8R0xLipoEP18QZH2FYz0/x7FgbVhU+5D20E2ppgqQ1c6X egLsXiA6bigCanU7SPlO5cLY4sAki/rk6bGvD1Y0AhbDY6FhmJWv2eXzfkgp5GZNbp/YH+ 3OPsJWPiosLWLEnImeUfgSp/n6BafsOnXZ+oYzBlSwUiT0eUdIwVB3ezoLImuOUn3+DbSZ LlmQQsWfnNOChbfnNYcoYbhHJHEaKvtuvSVAWN8qXppzlUdzc9X7PYV9pbYESDAFs50oBS hQcwWseBF2cHb6ObYgSVNrrUiNJdCq+DlYqsR5RvrByqzysruyuTWmAfvfyKyQ== 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 4VstX75WRDz1B2L; Sun, 2 Jun 2024 23:35: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 452NZpKe038486; Sun, 2 Jun 2024 23:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NZpsH038483; Sun, 2 Jun 2024 23:35:51 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:35:51 GMT Message-Id: <202406022335.452NZpsH038483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 3cc91b77514d - main - Revert "src.sys.obj.mk: Export OBJTOP" 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cc91b77514de209d7e6c2217cda2e44809280d3 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3cc91b77514de209d7e6c2217cda2e44809280d3 commit 3cc91b77514de209d7e6c2217cda2e44809280d3 Author: Jessica Clarke AuthorDate: 2024-06-02 23:33:52 +0000 Commit: Jessica Clarke CommitDate: 2024-06-02 23:33:52 +0000 Revert "src.sys.obj.mk: Export OBJTOP" Unfortunately this results in make universe's environment, i.e. corresponding to the host, being used for every one of its sub-makes, so they're in the wrong place and trample over each other. This reverts commit 2b7c1402f96be2d2986738e32706dab7b5691ef0. --- share/mk/src.sys.obj.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index e4c31f746f3d..708559edcdb8 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -94,9 +94,6 @@ OBJTOP:= ${OBJROOT}${MACHINE}.${MACHINE_ARCH} # TARGET.TARGET_ARCH handled in OBJROOT already. OBJTOP:= ${OBJROOT:H} .endif # ${MK_UNIFIED_OBJDIR} == "yes" -.if ${.MAKE.LEVEL} > 0 -.export OBJTOP -.endif .endif # empty(OBJTOP) # Fixup OBJROOT/OBJTOP if using MAKEOBJDIRPREFIX.