diff options
| author | imp <imp@FreeBSD.org> | 2014-05-10 16:39:15 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-10 16:39:15 +0000 |
| commit | 0ba54469ea873d4c1f7b93a0f472916587c5659c (patch) | |
| tree | bf1b777aac7064a0c7060c5c15dee4a5dcebb8b5 /sys/conf | |
| parent | d0cce18ef329116fbe07e5b9366884dbadb40288 (diff) | |
| download | FreeBSD-src-0ba54469ea873d4c1f7b93a0f472916587c5659c.zip FreeBSD-src-0ba54469ea873d4c1f7b93a0f472916587c5659c.tar.gz | |
bitrotted compat cruft removal:
o KMODDEPS warning is 15 years stale. Remove it.
o MK_CTF will always be defined now, so no need to test to see if it
is defined.
o no need to define MK_FORMAT_EXTENTIONS if undefined anymore.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/kern.mk | 3 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 19afc4d..ee9a204 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -1,8 +1,5 @@ # $FreeBSD$ -# Compat -MK_FORMAT_EXTENSIONS?=no - # # Warning flags for compiling the kernel and components of the kernel: # diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 242c3c6..b3f0589 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -65,10 +65,6 @@ KMODLOAD?= /sbin/kldload KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy -.if defined(KMODDEPS) -.error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND" -.endif - # Note: we're really bsd.kmod.mk, so we have to allow src.opts.mk to be # optional. Include it if we can so we can get /etc/src.conf changes, # if we're in the tree. If we can't include it that's OK. kern.opts.mk @@ -204,7 +200,7 @@ ${KMOD}.kld: ${OBJS} ${FULLPROG}: ${OBJS} .endif ${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS} -.if defined(MK_CTF) && ${MK_CTF} != "no" +.if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} .endif .if defined(EXPORT_SYMS) |
