aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2024-04-18 15:22:46 +0000
committerAndrew Turner <andrew@FreeBSD.org>2024-04-24 18:17:20 +0000
commit2c35c867ba05c8de167e1597c9044a72febdda63 (patch)
treeb220e9d322917dd9c34e3adfa6612a36a5f63709
parent9d40492efa467095340cf3dca5860880aa441472 (diff)
downloadsrc-2c35c867ba05c8de167e1597c9044a72febdda63.tar.gz
src-2c35c867ba05c8de167e1597c9044a72febdda63.zip
showconfig: Set MACHINE for src.opts.mk
Also set MACHINE and MACHINE_ARCH when reading config options from src.opts.mk. This ensures any machine-dependent options are reported correctly. Reviewed by: emaste, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44838
-rw-r--r--Makefile.inc13
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index a0fd539ed25f..0728df1221a0 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3598,7 +3598,8 @@ check-old: check-old-files check-old-libs check-old-dirs .PHONY
#
showconfig: .PHONY
@(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \
- ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes) 2>&1 | grep -E '^(MK|OPT)_[A-Z]' | sort -u
+ ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}) 2>&1 | \
+ grep -E '^(MK|OPT)_[A-Z]' | sort -u
.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/