From nobody Tue May 28 18:52:50 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 4VphTt6Ygcz5MtBY; Tue, 28 May 2024 18:52:50 +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 4VphTt5z7tz4Qwr; Tue, 28 May 2024 18:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716922370; 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=s6oQl05nGXrGtFQpI/O7dbClXaINp2ZARMx73PLyLsI=; b=e44Bi/9X0EiQM/JQITyCBse6anMAnAPoqCJp4qD81d1WaBb+/tllwFn5RctzcY3hjUoU74 awUYGzIk0ioGoPW3HPyKB08yp/uZ+O4UHbwFFvI9d3oED6wxbKkwktExQF5zJbS6RgLniv 7d1IcCFX2kXnjInEWzdK3ggLUjDwtjjvJR4Akzdrq23Yo/vOwaKCbqlTYmrzWBBJ1yk4Jl s4CqmT6HEamNPVzgoELcBGR+kx7ih607gXZlqY/7+tWsW6/jLS3utH2OsaiKZaGk69CilG nBAECwQikywb1WrpojY1PYMQuKZcCPkv4C80iwVH87miGJJyXuuYmqk91+x/RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716922370; a=rsa-sha256; cv=none; b=tdvVKl3GlT8md8LyyAj5LDCFOoM99ViFSCaC/6kBtwktme9FmCwRTTmK6IOn9mOvng+3/w ZcCwPzQiAvuZ7+yfnwDvEgF80+WvvPEaOICob0KiuFy+p6FjM7pyjmnxx096x7tb6rRGaE 9nyBhxr7gIAnsl/baEJ5WawGtuFg7RLDMOMWCedGU8WLh8UauQvXxggGyUsVL+xdNs5wvz 3wWNC9Tnch9lMXZ7NgAMSNFCHSfiDRbx5hEwOCkJ0hLswGxdwK/bEUphjqpF3fVV4ZTvUb 3GfEwF1mvXtb+xo7xDVAHm2LO8YvDiaj04z7QJiFQW71YWcyJ4BlGm9unt4f6Q== 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=1716922370; 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=s6oQl05nGXrGtFQpI/O7dbClXaINp2ZARMx73PLyLsI=; b=hx/wZ/FSFFlaf5ccOiW5hNQMAWvjYZiVdOp9WeNsFoacmmNHxOFCFUnTSjSQe0kvPiPIRu oqY+GeGsF3vuE1bRNbib95ebhV/ycMhUVxVKLRcKSld4cJUBIuBfEY1lzkhysQBJPV7M5U SVbG/5Ruza26REw0EsHAVYwghTPktuxT16p7ZEfu1H1iBlRUDssoureiPFj477pz6DGd+o b5nl2OZSksaHKcbDXTPxQn7Dcdji7yMPVYK3gR8VNKvaqdwbbO9zwo7sbJKkyTiqTZnVQV tbgsKogi7n8At7OWX/vfG3nbIUIj2i329EbdBDxinhJuu6uh7+iZD/w4ne2/Lg== 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 4VphTt5Zc4zNt9; Tue, 28 May 2024 18:52:50 +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 44SIqoMN094997; Tue, 28 May 2024 18:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44SIqo71094994; Tue, 28 May 2024 18:52:50 GMT (envelope-from git) Date: Tue, 28 May 2024 18:52:50 GMT Message-Id: <202405281852.44SIqo71094994@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: 2b7c1402f96b - main - 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b7c1402f96be2d2986738e32706dab7b5691ef0 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2b7c1402f96be2d2986738e32706dab7b5691ef0 commit 2b7c1402f96be2d2986738e32706dab7b5691ef0 Author: Simon J. Gerraty AuthorDate: 2024-05-28 18:51:31 +0000 Commit: Simon J. Gerraty CommitDate: 2024-05-28 18:51:31 +0000 src.sys.obj.mk: Export OBJTOP If we had to set OBJTOP we want to .export it (if .MAKE.LEVEL > 0) for the benefit of things like x!= ${.MAKE} -r ... and similar. Without OBJTOP, the default MAKEOBJDIR setting will result in attempting to use an objdir like /lib or /bin etc in some cases. This patch is based on D30990 with the addition of the check for level > 0. Reviewed by: jrtc27 Differential Revision: --- share/mk/src.sys.obj.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index 708559edcdb8..e4c31f746f3d 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -94,6 +94,9 @@ 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.