summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2011-05-22 18:01:52 +0000
committerimp <imp@FreeBSD.org>2011-05-22 18:01:52 +0000
commit2332df9dae820abccb8310323c90dfc62622afc0 (patch)
tree87b8fab99c081b7d1f21094bc9e99f88269ca3dc
parent2c928f61730eb9f4154c757e65e9bd99ba8e48ba (diff)
downloadFreeBSD-src-2332df9dae820abccb8310323c90dfc62622afc0.zip
FreeBSD-src-2332df9dae820abccb8310323c90dfc62622afc0.tar.gz
Start to usher INSTALL_NODEBUG hack out the door. Add new
WITH{OUT,}_KERNEL_SYMBOLS (defaulting to WITH). In the fullness of time, likely around 2020, INSTALL_NODEBUG will be removed. For now, don't print a warning when using INSTALL_NODEBUG, but that will be coming soon.
-rw-r--r--share/mk/bsd.own.mk1
-rw-r--r--sys/conf/kern.post.mk4
-rw-r--r--sys/conf/kmod.mk2
3 files changed, 4 insertions, 3 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 3669fac..f7ab5f8 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -335,6 +335,7 @@ __DEFAULT_YES_OPTIONS = \
IPX \
JAIL \
KERBEROS \
+ KERNEL_SYMBOLS \
KVM \
LEGACY_CONSOLE \
LIB32 \
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 80b1bc2..df5a717 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -227,7 +227,7 @@ kernel-install:
.endif
mkdir -p ${DESTDIR}${KODIR}
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
-.if defined(DEBUG) && !defined(INSTALL_NODEBUG)
+.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} == "yes"
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
.if defined(KERNEL_EXTRA_INSTALL)
@@ -239,7 +239,7 @@ kernel-install:
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
-.if defined(DEBUG) && !defined(INSTALL_NODEBUG)
+.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} == "yes"
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 6d22e41..954db30 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -286,7 +286,7 @@ realinstall: _kmodinstall
_kmodinstall:
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
-.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG)
+.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} == "yes"
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR}
.endif
OpenPOWER on IntegriCloud