We don't have a CPPFLAGS, COPTS or CPUFLAGS.

Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-03-26 03:46:04 +00:00
parent ac978f5a8f
commit 38551f8fae
5 changed files with 7 additions and 9 deletions

View File

@ -76,7 +76,6 @@ SRCS= base64.c \
write_pid.c \ write_pid.c \
xfree.c xfree.c
CPPFLAGS+= -DBUILD_ROKEN_LIB
CFLAGS+=-I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/roken -I.
CLEANFILES= roken.h CLEANFILES= roken.h

View File

@ -309,7 +309,7 @@ PROGS_CXX PROG and PROGS_CXX in one Makefile. To define
SRCS.bar= bar_src.c SRCS.bar= bar_src.c
The supported variables are BINDIR BINGRP BINMODE BINOWN The supported variables are BINDIR BINGRP BINMODE BINOWN
CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD CFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD
LDFLAGS LIBADD MAN MLINKS PROGNAME SRCS. LDFLAGS LIBADD MAN MLINKS PROGNAME SRCS.
PROGNAME The name that the above program will be installed as, if PROGNAME The name that the above program will be installed as, if

View File

@ -58,14 +58,12 @@ CLANG_ANALYZE_CXXFLAGS= ${CXXFLAGS:N-Wa,--fatal-warnings}
.c.clang-analyzer: .c.clang-analyzer:
${CC:N${CCACHE_BIN}} ${CLANG_ANALYZE_FLAGS} \ ${CC:N${CCACHE_BIN}} ${CLANG_ANALYZE_FLAGS} \
${CLANG_ANALYZE_CFLAGS} ${CPPFLAGS} \ ${CLANG_ANALYZE_CFLAGS} \
${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \ ${.IMPSRC}
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
.cc.clang-analyzer .cpp.clang-analyzer .cxx.clang-analyzer .C.clang-analyzer: .cc.clang-analyzer .cpp.clang-analyzer .cxx.clang-analyzer .C.clang-analyzer:
${CXX:N${CCACHE_BIN}} ${CLANG_ANALYZE_CXX_FLAGS} \ ${CXX:N${CCACHE_BIN}} ${CLANG_ANALYZE_CXX_FLAGS} \
${CLANG_ANALYZE_CXXFLAGS} ${CPPFLAGS} \ ${CLANG_ANALYZE_CXXFLAGS} \
${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \ ${.IMPSRC}
${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
CLANG_ANALYZE_SRCS= \ CLANG_ANALYZE_SRCS= \
${SRCS:M*.[cC]} ${SRCS:M*.cc} \ ${SRCS:M*.[cC]} ${SRCS:M*.cc} \

View File

@ -8,6 +8,7 @@
# XXX The use of COPTS in modern makefiles is discouraged. # XXX The use of COPTS in modern makefiles is discouraged.
.if defined(COPTS) .if defined(COPTS)
.warning COPTS should be CFLAGS.
CFLAGS+=${COPTS} CFLAGS+=${COPTS}
.endif .endif

View File

@ -24,7 +24,7 @@ PROGS += ${PROGS_CXX}
# just one of many # just one of many
PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \
PROGNAME SRCS WARNS PROGNAME SRCS WARNS
PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LINKS \ PROG_VARS += CFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LINKS \
LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
.for v in ${PROG_VARS:O:u} .for v in ${PROG_VARS:O:u}
.if empty(${PROG_OVERRIDE_VARS:M$v}) .if empty(${PROG_OVERRIDE_VARS:M$v})