aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2023-03-06 15:56:13 +0000
committerEd Maste <emaste@FreeBSD.org>2023-03-06 21:03:22 +0000
commitd7a491dd3037030a09e579225899cd0617a5ef4f (patch)
tree45356db59f233240041e63e21d9e8ecc65709692
parent713264f6b8bc5f927dd52cf8ffcccfa397034fec (diff)
downloadsrc-d7a491dd3037030a09e579225899cd0617a5ef4f.tar.gz
src-d7a491dd3037030a09e579225899cd0617a5ef4f.zip
make showconfig: set MACHINE and MACHINE_ARCH
Previously these were not set for the showconfig target, so took the host's value rather than the target. As a result some machine-dependent kernel options were not reported with correct defaults in the src.conf manpage. PR: 269994 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38926
-rw-r--r--Makefile.inc12
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 542121976333..2767a6038354 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3390,7 +3390,7 @@ check-old: check-old-files check-old-libs check-old-dirs .PHONY
# showconfig - show build configuration.
#
showconfig: .PHONY
- @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes; \
+ @(${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 ^MK_ | sort -u
.if !empty(KRNLOBJDIR) && !empty(KERNCONF)