d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restrict the include search path using -nostdinc -I- in $(CFLAGS} as

Browse Source 
in kernel Makefiles.  Nothing in /usr/include is used (provided
relative paths for sys/* and <machine> can be found), so there is
no need for the -I/usr/include kludge as in kernel Makefiles.
This commit is contained in:
Bruce Evans 1998-02-01 17:19:54 +00:00
parent f63999476c
commit 021886ff87
2 changed files with 24 additions and 6 deletions
share/mk
bsd.kmod.mk
sys/conf
kmod.mk

15
share/mk/bsd.kmod.mk

@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $Id: bsd.kmod.mk,v 1.41 1997/11/09 15:03:13 wosch Exp $
# $Id: bsd.kmod.mk,v 1.42 1998/01/26 20:36:38 bde Exp $
#
# The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
#
@ -92,10 +92,19 @@ MODUNLOAD?= /sbin/modunload
CFLAGS+= ${COPTS} -DKERNEL -DACTUALLY_LKM_NOT_KERNEL ${CWARNFLAGS}
# Add -I paths for system headers. Individual LKM makefiles don't need any
# -I paths for this. Most of them need .PATH statement(s) for non-headers.
# Don't use any standard or source-relative include directories.
# Since -nostdinc will annull any previous -I paths, we repeat all
# such paths after -nostdinc. It doesn't seem to be possible to
# add to the front of `make' variable.
_ICFLAGS:= ${CFLAGS:M-I*}
CFLAGS+= -nostdinc -I- ${_ICFLAGS}
# Add -I paths for system headers. Individual LKM makefiles don't
# need any -I paths for this. Similar defaults for .PATH can't be
# set because there are no standard paths for non-headers.
CFLAGS+= -I${.OBJDIR} -I${.OBJDIR}/@
# XXX this is now dubious.
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
.endif

15
sys/conf/kmod.mk

@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
# $Id: bsd.kmod.mk,v 1.41 1997/11/09 15:03:13 wosch Exp $
# $Id: bsd.kmod.mk,v 1.42 1998/01/26 20:36:38 bde Exp $
#
# The include file <bsd.kmod.mk> handles installing Loadable Kernel Modules.
#
@ -92,10 +92,19 @@ MODUNLOAD?= /sbin/modunload
CFLAGS+= ${COPTS} -DKERNEL -DACTUALLY_LKM_NOT_KERNEL ${CWARNFLAGS}
# Add -I paths for system headers. Individual LKM makefiles don't need any
# -I paths for this. Most of them need .PATH statement(s) for non-headers.
# Don't use any standard or source-relative include directories.
# Since -nostdinc will annull any previous -I paths, we repeat all
# such paths after -nostdinc. It doesn't seem to be possible to
# add to the front of `make' variable.
_ICFLAGS:= ${CFLAGS:M-I*}
CFLAGS+= -nostdinc -I- ${_ICFLAGS}
# Add -I paths for system headers. Individual LKM makefiles don't
# need any -I paths for this. Similar defaults for .PATH can't be
# set because there are no standard paths for non-headers.
CFLAGS+= -I${.OBJDIR} -I${.OBJDIR}/@
# XXX this is now dubious.
.if defined(DESTDIR)
CFLAGS+= -I${DESTDIR}/usr/include
.endif