From nobody Sat Apr 22 19:26:56 2023 X-Original-To: dev-commits-src-main@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 4Q3hGm638Hz469qT; Sat, 22 Apr 2023 19:26:56 +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 4Q3hGm3MrXz4T9d; Sat, 22 Apr 2023 19:26:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682191616; 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=ZL+u9XXxMS96+ymMA5E429VwFgwUXxO1AX0AOWKzj0s=; b=QGv2SCif6rtJa8O58hFAikTXqLcpY4kWAyEciyhjXysD3YYg7WS1nHNoFSFudgiNG4mWYP AWO6QphxVfA8PwiYGTdTkyoeMgQ7p8zuato0A3h4C1g3aIiYH317pI3FGS6ajHGJ9Lm1k/ cpfh0f6LNIvd7eJP/2e5QmCwilb1mrHrBTehdqyBQcl8gdS6QSoA/4dy+ZylurEhuIsYAJ +/HCbAmy3Nc5+Kta1XGc0iJxZbEVyeSUNCcjrpKSzOCnE1vU8dBq17FXLZhdfHcqUtPQME ZetVtgk4KLlGxDrMf9g9LkXr7ZSQ4CccdUX7RaCD2AkvUeshBuld3QGADG9Efg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682191616; 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=ZL+u9XXxMS96+ymMA5E429VwFgwUXxO1AX0AOWKzj0s=; b=we/4MRQSbdStEVnXwcEPBUs6rPdvCVkNyMX5ryQPmUgOJOb7gm/8XM6H/zlnjSOTVFMMYZ sx8g/f9pliFVXNgq6wu3k86f+KZM9e1c3yphvuu4Oh8QxPPD/HtXm3X11hlRJprBpmSnWD Ri17CRysT0v653eoOWBthRNFRhQWuDe2ZYu6Ayi9mqNiBiagjTa8bPuUaPscGxcKHvrdPV 1H38rKOX0k6xqgEsCKzioGcjpjg0brkCmz/Ri21jS3eJESu0EUGq3hbKnopS3sJaK+oowi pjpRmh10PHKwyZgVwCoiS5E8ibn45g9QHVuM4Ice7ul+D0FOJ1Cl7RLl5LShQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682191616; a=rsa-sha256; cv=none; b=N8pah8q7HtV0qbQIran4Wfnd5xCJe59ifmD3xXqNGm2MmHtUiWpfk1psLU3M0OjL6H/geE ijiXWYkqRUByyO3f4qEpCjGmQ/e+NuAVMqOJIcrMU5JR1+mwynhxjL2QThE4XjGNOnybgE zYHUZoxtw/IjBPr76EBXsErsCmgxfE1LoGgfoMp3ieseUPeVpSB2rYHuSyq+HmZXiIC9pQ UCpQQgRleONLIXP5ldU9XgECIKyny6Y78Iwtnm/tNo7PhxRdnA24jpYSItd5tRZ/936mA5 90QCuHvr4spdffAkUbixSULJnV1Q7Dphrch0+0/wqQBWytzGuXHHTqVL1dHibA== 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 4Q3hGm2TZ1zDw8; Sat, 22 Apr 2023 19:26:56 +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 33MJQuhf001441; Sat, 22 Apr 2023 19:26:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MJQuBl001440; Sat, 22 Apr 2023 19:26:56 GMT (envelope-from git) Date: Sat, 22 Apr 2023 19:26:56 GMT Message-Id: <202304221926.33MJQuBl001440@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: db98bc2c0d3a - main - Allow tools/build to work for DIRDEPS_BUILD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: db98bc2c0d3aae1772ee773c22c8d01d2add6c92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=db98bc2c0d3aae1772ee773c22c8d01d2add6c92 commit db98bc2c0d3aae1772ee773c22c8d01d2add6c92 Author: Simon J. Gerraty AuthorDate: 2023-04-22 19:25:54 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-22 19:25:54 +0000 Allow tools/build to work for DIRDEPS_BUILD We want to be able to build some host tools for non-FreeBSD hosts without building more than we need. The DIRDEPS_BUILD lets us do that. We use the pseudo MACHINE "host" when building for the host - deal with that when setting _host_arch. Reviewed by: jrtc27 Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39751 --- tools/build/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/Makefile b/tools/build/Makefile index 922d86dba7e7..a1b8bbb8b2aa 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -125,7 +125,11 @@ CHACHA20INCSDIR= ${INCLUDEDIR}/crypto/chacha20 CHACHA20INCS+= ${SRCTOP}/sys/crypto/chacha20/_chacha.h \ ${SRCTOP}/sys/crypto/chacha20/chacha.h +.if ${MACHINE} == "host" +_host_arch= ${_HOST_ARCH} +.else _host_arch=${MACHINE} +.endif .if ${_host_arch} == "x86_64" # bmake on Linux/mac often prints that instead of amd64 _host_arch=amd64