From nobody Tue Dec 21 16:02:06 2021
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 9539E18EC51E;
Tue, 21 Dec 2021 16:02:06 +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 4JJLnB2Gn1z3tXp;
Tue, 21 Dec 2021 16:02:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
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 2F580493E;
Tue, 21 Dec 2021 16:02:06 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLG26vN026506;
Tue, 21 Dec 2021 16:02:06 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLG26XJ026505;
Tue, 21 Dec 2021 16:02:06 GMT
(envelope-from git)
Date: Tue, 21 Dec 2021 16:02:06 GMT
Message-Id: <202112211602.1BLG26XJ026505@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Dimitry Andric <dim@FreeBSD.org>
Subject: git: 839cada5af34 - stable/12 - Makefile: Fix MAKEOBJDIRPREFIX command-line variable check for bmake
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: dim
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 839cada5af3470afa1cd4531c9c108f5adb8a5b1
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1640102526;
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=TtI6zJahsjOIyw4K1p7cF3bNr8b0Yh1DUFWyrCTVQlQ=;
b=vYxSzCKDgHaYA0MI7I1Pv0alqailNhJmIvAQnQEqazvEICTHi4MTAgFlQ0MIhIwV06yzm3
fM+XAf03F85DtM3eT8ue/PHe6b22O3vKHO79Otvt2G5nCeL1ZQe8u8m9MMe2FVxrjCcLt4
oMXOcRUGXrFN+NNPG+0+U8YEw8+v+DGbC7YxSYm4lVbOaL1pAfdjfIDJhsEyRQprLSvpjl
ubUEqxm6QXddYw/Q5EE+j/ycG92vkDwDXs9fdpEgTB7nyF5CK7SXYv9j0nM74ZuAjudV3R
z1qQEl0NX+ymRFVvxlF89KVYfUbSZtt8kXLPpkzlKucjDLfu9cVbGJubXLpT0w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640102526; a=rsa-sha256; cv=none;
b=VTAn+TxlgnzV3H/RA8ylTXQ2lmd6kIrYHe4tO36LFfiTYosGppHkZgrwUl/akGa+WRC0JQ
V/wEeFrGG5ltx4JXYIe3zzqby86mD3ZXinUDt/+hRnqsEr26TaOc/aJN9OS8+ptbHB5gKF
9k7kkWCDvluBTrHp7Z8kaG9kBus4I9UTEinysw5T+80vf1jZnc7yky7J2UtADxdFYIDPEX
xmTVbmyq/K6/cxTd2RaaSyf3s8rm9+2TTOsDM5QHM2sA+J1CYqth0fuk72Du4o44u3NwRe
lxeWEMt7NqtF/wPn6iZU9NBbUNNjhVCSDQbDcoZY22Ip3gw2Ivxm8f421S3M6g==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=839cada5af3470afa1cd4531c9c108f5adb8a5b1
commit 839cada5af3470afa1cd4531c9c108f5adb8a5b1
Author: Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2021-07-21 01:48:10 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-21 15:14:36 +0000
Makefile: Fix MAKEOBJDIRPREFIX command-line variable check for bmake
Unlike the old fmake, running make FOO=bar when using bmake doesn't put
FOO=bar in .MAKEFLAGS at the top level, it instead just puts FOO in
.MAKEOVERRIDES and the full MAKEFLAGS will be formed for sub-makes.
Moreover, this only applies for sub-makes in rules, so this doesn't
apply to those in shell assignments. This means that the current check
does not catch make MAKEOBJDIRPREFIX=..., only those defined in config
files. Thus we must also check .MAKEOVERRIDES explicitly.
Reviewed by: sjg
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D31015
(cherry picked from commit d0c737e18454868447f731fe2b10d04f50d9d53b)
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 21ce26f215c9..9ad32d27fc1d 100644
--- a/Makefile
+++ b/Makefile
@@ -207,7 +207,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
SRCCONF=${SRCCONF} SRC_ENV_CONF= \
-f /dev/null -V MAKEOBJDIRPREFIX dummy
-.if !empty(_MAKEOBJDIRPREFIX)
+.if !empty(_MAKEOBJDIRPREFIX) || !empty(.MAKEOVERRIDES:MMAKEOBJDIRPREFIX)
.error MAKEOBJDIRPREFIX can only be set in environment or src-env.conf(5),\
not as a global (in make.conf(5) or src.conf(5)) or command-line variable.
.endif