aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2014-10-21 20:29:51 +0000
committerWarner Losh <imp@FreeBSD.org>2014-10-21 20:29:51 +0000
commit983678dd7c02ef40647119e284c0957086bb81fc (patch)
tree689d92fbf31ec162d541a22105d8a40c161db412 /Makefile.inc1
parente8a66c33e46cfbdd14d79bf7e9ec9b39c205437f (diff)
downloadsrc-983678dd7c02ef40647119e284c0957086bb81fc.tar.gz
src-983678dd7c02ef40647119e284c0957086bb81fc.zip
Generate both userland and kernel option settings for showconfig.
PR: 191920
Notes
Notes: svn path=/head/; revision=273418
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc13
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 92679ba4765d..c38ec62f5e03 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1886,7 +1886,8 @@ check-old: check-old-files check-old-libs check-old-dirs
# showconfig - show build configuration.
#
showconfig:
- @${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
+ @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1; \
+ ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1) 2>&1 | grep ^MK_ | sort -u
.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/