diff options
| -rw-r--r-- | share/mk/bsd.README | 2 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 1 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 2 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 4 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/share/mk/bsd.README b/share/mk/bsd.README index a31339ee3e86..521f8ac77880 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -217,7 +217,7 @@ CLEANFILES Additional files to remove and CLEANDIRS additional directories to remove during clean and cleandir targets. "rm -f" and "rm -rf" used respectively. -COPTS Additional flags to the compiler when creating C objects. +CFLAGS Flags to the compiler when creating C objects. FILES A list of non-executable files. The installation is controlled by the FILESNAME, FILESOWN, diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 27e3d26c3584..792b49cc1cf7 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -5,6 +5,7 @@ .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm +# XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) CFLAGS+=${COPTS} .endif diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 7736a79b08fa..471ae7f92765 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -33,7 +33,7 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" -COPTS+= -msoft-float +CFLAGS+= -msoft-float %BEFORE_DEPEND diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 98d1c736c671..e1a088bb223b 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -66,8 +66,8 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm -COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h -CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} +CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} +CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h .if ${CC} != "icc" CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 6ac4035e33fa..17a4e6576a01 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -73,7 +73,7 @@ OBJCOPY?= objcopy .if ${CC} == "icc" CFLAGS:= ${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/} .endif -CFLAGS+= ${COPTS} -D_KERNEL +CFLAGS+= -D_KERNEL CFLAGS+= -DKLD_MODULE # Don't use any standard or source-relative include directories. |