Never hardcode /sys into these Makefiles. The proper way to spell it is $S.
Also, move the -I stuff to the centralized kern.pre.mk. However, it might be better to add these flags to files.conf. This is a short term fix to fix the broken builds on my machine (I don't have a valid /sys link).
This commit is contained in:
parent
20064a62a9
commit
23804f1a7d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=145016
@ -87,6 +87,4 @@ __reml.S: $S/$M/$M/divrem.m4
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -52,6 +52,4 @@ MKMODULESENV+= MACHINE=amd64
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -58,6 +58,4 @@ ldscript.$M: $S/conf/ldscript.$M
|
||||
sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -46,6 +46,4 @@ MKMODULESENV+= MACHINE=i386
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -52,6 +52,4 @@ ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -46,6 +46,4 @@ MKMODULESENV+= MACHINE=pc98
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -51,6 +51,4 @@ CFLAGS+= -fno-omit-frame-pointer
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -46,6 +46,4 @@ MDOBJS= exception.o interrupt.o
|
||||
|
||||
%RULES
|
||||
|
||||
CFLAGS+=-I/sys/dev/twa
|
||||
|
||||
.include "$S/conf/kern.post.mk"
|
||||
|
@ -67,6 +67,9 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
|
||||
# ... and the same for the NgATM stuff
|
||||
INCLUDES+= -I$S/contrib/ngatm
|
||||
|
||||
# .. and the same for twa
|
||||
INCLUDES+= -I$S/dev/twa
|
||||
|
||||
CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
|
||||
CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h
|
||||
.if ${CC} != "icc"
|
||||
|
Loading…
Reference in New Issue
Block a user