Date: Mon, 6 Mar 2023 21:03:34 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d7a491dd3037 - main - make showconfig: set MACHINE and MACHINE_ARCH Message-ID: <202303062103.326L3Ypu068334@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d7a491dd3037030a09e579225899cd0617a5ef4f commit d7a491dd3037030a09e579225899cd0617a5ef4f Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-03-06 15:56:13 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-03-06 21:03:22 +0000 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 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303062103.326L3Ypu068334>