From db98bc2c0d3aae1772ee773c22c8d01d2add6c92 Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Sat, 22 Apr 2023 12:25:54 -0700 Subject: [PATCH] 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 922d86dba7e..a1b8bbb8b2a 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