Author: imp
Date: Mon Nov 16 22:37:28 2015
New Revision: 290954
URL: https://svnweb.freebsd.org/changeset/base/290954
Log:
Remove redundant copies of CDDL_CFLAGS.
Modified:
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Mon Nov 16 22:22:17 2015 (r290953)
+++ head/sys/conf/kern.pre.mk Mon Nov 16 22:37:28 2015 (r290954)
@@ -157,15 +157,15 @@ DTRACE_CFLAGS+= -I$S/cddl/contrib/openso
.endif
DTRACE_CFLAGS+= -I$S/cddl/contrib/opensolaris/common/util -I$S
-DDIS_MEM -DSMP
DTRACE_ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${DTRACE_CFLAGS}
-DTRACE_C= ${CC} -c ${DTRACE_CFLAGS} ${CDDL_CFLAGS} ${WERROR}
${PROF} ${.IMPSRC}
-DTRACE_S= ${CC} -c ${DTRACE_ASM_CFLAGS} ${CDDL_CFLAGS} ${WERROR}
${.IMPSRC}
+DTRACE_C= ${CC} -c ${DTRACE_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
+DTRACE_S= ${CC} -c ${DTRACE_ASM_CFLAGS} ${WERROR} ${.IMPSRC}
# Special flags for managing the compat compiles for DTrace/FBT
FBT_CFLAGS= -DBUILDING_DTRACE -nostdinc
-I$S/cddl/dev/fbt/${MACHINE_CPUARCH} -I$S/cddl/dev/fbt
-I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common -I$S
${CDDL_CFLAGS}
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
FBT_CFLAGS+= -I$S/cddl/dev/fbt/x86
.endif
-FBT_C= ${CC} -c ${FBT_CFLAGS} ${CDDL_CFLAGS} ${WERROR}
${PROF} ${.IMPSRC}
+FBT_C= ${CC} -c ${FBT_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
.if ${MK_CTF} != "no"
NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
