From nobody Tue Apr 25 07:27:14 2023 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 4Q5D8y3dnVz46mX6; Tue, 25 Apr 2023 07:27:14 +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 4Q5D8y2yYVz3Q8b; Tue, 25 Apr 2023 07:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682407634; 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=7ATzZ3Ek8uuiiGblc4YafHIvoOI9VIX74v0qalwsnk4=; b=hH9CI2dVQTDe992klSbdvJKzO/gQCiNlcHY/R7fX4WevSo2KUhpWxD/0KmihAz7kI2YS4o 8ynrJbpH7nBDia3EAzWYz4uW73OZz86IMgpusjkstiaNvh28jLO04iKPU3jYpXQYdNUe1P iMeY27Mxtd7liJdBgpZGIh/kVzoFb2TmZfLEa+bEmzGLcnc123kjSS4N1u/pOJ1B//VGuP gSwJCYwPWCAJrD7r32mH4nmAqViZFfdfIgbgODht+iUYhskoEDILB++ShHyCRY7gjcwT+X u3VLEzIOZdFrQ5iZCMeh4sOYmcAyZTLmPQQOeZkxGWSOZ6N0Hc070BrCikVccQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682407634; 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=7ATzZ3Ek8uuiiGblc4YafHIvoOI9VIX74v0qalwsnk4=; b=L70Q1R6r/DWeG70sP+vdHod7I4ScEwkf2YNwClTpNskpQ6vIteprMXepI+rKuWQqXnISPr DLgGnV69hFl+ndt55S2lQNXPCL1bq8PQmLKvLTEbbXcWkAVkSSiTBtOvFt14sp7AcJQVpv EVeGe1jwMMUGpugtJCUBrVs61e+JTXsxJTflzRAhQUaN/Ql5aR1Tal6dor0Xd4F5jNWc5F w2IVq5QAHDuorqobnQ3GnotOWx7SzjwI+c0aohYXHNez56kBPYCjlsoR0Ox/W0zw3r/wvc ulkw9HakQ40UUJxG6JHGTQdUsfpz7ZdqmJCUk5HB03qoATKWEb4jF85bSJxA0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682407634; a=rsa-sha256; cv=none; b=Vh5eh0cgC+0/sERHkVYw0M2xpuLActfvUvRGr8t8/xVMzhdZvlUeFfTC71YLz1NfyeBev5 M19/tO77qLjbJZ+nEO09xgw51eLwYQadz/WPK8xuXHVHkCZHBGDWSaaQlnyQGAwMwlvFyX qvGDZz+jjjrE3dFJsfbyte3grp1m6sGGz87HbZrY1kmXNn5y+mc1Wdv7qYFZveHD+Sedwh St6JOQKn60y0w3b83doWKfUSE3oU+YyTS2Hki4Kq4Hahpnx9PFF5he+cdHevwfBZfnzBlF Zzsa1gy8BqSjrqINhcHRCblEX8dRr1D9qicadjQwR6hffi1PtRH28V+xkNkkRw== 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 4Q5D8y1vSGzyBy; Tue, 25 Apr 2023 07:27:14 +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 33P7REWc033092; Tue, 25 Apr 2023 07:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P7RED5033091; Tue, 25 Apr 2023 07:27:14 GMT (envelope-from git) Date: Tue, 25 Apr 2023 07:27:14 GMT Message-Id: <202304250727.33P7RED5033091@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: 4b932c2c9ef7 - main - Set MK_host_egacy=yes earlier 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 4b932c2c9ef70252986792df8c71e0b058dac24e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4b932c2c9ef70252986792df8c71e0b058dac24e commit 4b932c2c9ef70252986792df8c71e0b058dac24e Author: Simon J. Gerraty AuthorDate: 2023-04-25 07:26:35 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-25 07:26:35 +0000 Set MK_host_egacy=yes earlier If we need to set MK_host_egacy=yes we might need to check it in local.toolchain.mk so set it earlier in local.meta.sys.env.mk Leave the default MK_host_egacy?=no in local.sys.mk so it can be tested in Makefiles without concern for build mode. --- share/mk/local.meta.sys.env.mk | 7 +++++++ share/mk/local.sys.mk | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/share/mk/local.meta.sys.env.mk b/share/mk/local.meta.sys.env.mk index 6b692d13fedf..6d0d493f1047 100644 --- a/share/mk/local.meta.sys.env.mk +++ b/share/mk/local.meta.sys.env.mk @@ -93,3 +93,10 @@ META_MODE+= missing-filemon=yes # this does not need/want filemon UPDATE_DEPENDFILE= NO .endif + +.if ${MK_DIRDEPS_BUILD} == "yes" +.if ${.MAKE.OS} != "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} +# a pseudo option to indicate we need libegacy for host +MK_host_egacy= yes +.endif +.endif diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index abcbf396c6b4..148499483c8b 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -79,12 +79,7 @@ JOB_MAX:= ${jm:R} .endif .endif -.if ${MK_DIRDEPS_BUILD} == "yes" -.if ${.MAKE.OS} != "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} -# a pseudo option to indicate we need libegacy for host -MK_host_egacy= yes -.endif -.endif +# this will be set via local.meta.sys.env.mk if appropriate MK_host_egacy?= no .if ${.MAKE.MODE:Mmeta*} != ""