Move the -I../../../include or -I/usr/include to the last entry on the
cc arguments. Otherwise ipfilter's bogus #include lines will compile reference /usr/include/netinet/ip_frag.h etc.
This commit is contained in:
parent
d4906adb59
commit
6697e35149
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=78131
@ -42,6 +42,11 @@ COPTFLAGS?=-O -pipe
|
||||
COPTFLAGS+= ${_CPUCFLAGS}
|
||||
.endif
|
||||
INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
|
||||
|
||||
# This hack lets us use the ipfilter code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
@ -49,10 +54,6 @@ INCLUDES+= -I$S/../include
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
# This hack lets us use the ipfilter code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -42,12 +42,6 @@ COPTFLAGS?=-O -pipe
|
||||
COPTFLAGS+= ${_CPUCFLAGS}
|
||||
.endif
|
||||
INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
# This hack lets us use the Intel ACPICA code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
@ -56,6 +50,13 @@ INCLUDES+= -I$S/contrib/dev/acpica
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -52,12 +52,6 @@ COPTFLAGS?=-O -pipe
|
||||
COPTFLAGS+= ${_CPUCFLAGS}
|
||||
.endif
|
||||
INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
# This hack lets us use the Intel ACPICA code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
@ -66,6 +60,13 @@ INCLUDES+= -I$S/contrib/dev/acpica
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -44,12 +44,6 @@ COPTFLAGS?=-O -pipe
|
||||
COPTFLAGS+= ${_CPUCFLAGS}
|
||||
.endif
|
||||
INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
# This hack lets us use the Intel ACPICA code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
@ -58,6 +52,13 @@ INCLUDES+= -I$S/contrib/dev/acpica
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
@ -42,12 +42,6 @@ COPTFLAGS?=-O -pipe
|
||||
COPTFLAGS+= ${_CPUCFLAGS}
|
||||
.endif
|
||||
INCLUDES= -nostdinc -I- ${INCLMAGIC} -I. -I$S -I$S/dev
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
# This hack lets us use the Intel ACPICA code without spamming a new
|
||||
# include path into 100+ source files.
|
||||
@ -56,6 +50,13 @@ INCLUDES+= -I$S/contrib/dev/acpica
|
||||
# ... and the same for ipfilter
|
||||
INCLUDES+= -I$S/contrib/ipfilter
|
||||
|
||||
# This hack is to allow kernel compiles to succeed on machines w/out srcdist
|
||||
.if exists($S/../include)
|
||||
INCLUDES+= -I$S/../include
|
||||
.else
|
||||
INCLUDES+= -I/usr/include
|
||||
.endif
|
||||
|
||||
COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user