diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-03-26 03:46:04 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-03-26 03:46:04 +0000 |
| commit | 3a66d610bad78c90becc73f1cc86cd7c36c6904e (patch) | |
| tree | a21a39d990c49beeb7517687e7dd0f6cdbe75574 | |
| parent | 0f40e82d352beb9d2a8fbbe09cc2a74ecbcbd042 (diff) | |
| download | FreeBSD-src-3a66d610bad78c90becc73f1cc86cd7c36c6904e.zip FreeBSD-src-3a66d610bad78c90becc73f1cc86cd7c36c6904e.tar.gz | |
We don't have a CPPFLAGS, COPTS or CPUFLAGS.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | kerberos5/lib/libroken/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.README | 2 | ||||
| -rw-r--r-- | share/mk/bsd.clang-analyze.mk | 10 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.progs.mk | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index aade99a..8bd27e6 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -76,7 +76,6 @@ SRCS= base64.c \ write_pid.c \ xfree.c -CPPFLAGS+= -DBUILD_ROKEN_LIB CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= roken.h diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 1ae1510..02c51d3 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -309,7 +309,7 @@ PROGS_CXX PROG and PROGS_CXX in one Makefile. To define SRCS.bar= bar_src.c 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. PROGNAME The name that the above program will be installed as, if diff --git a/share/mk/bsd.clang-analyze.mk b/share/mk/bsd.clang-analyze.mk index 61321b5..a8c9961 100644 --- a/share/mk/bsd.clang-analyze.mk +++ b/share/mk/bsd.clang-analyze.mk @@ -58,14 +58,12 @@ CLANG_ANALYZE_CXXFLAGS= ${CXXFLAGS:N-Wa,--fatal-warnings} .c.clang-analyzer: ${CC:N${CCACHE_BIN}} ${CLANG_ANALYZE_FLAGS} \ - ${CLANG_ANALYZE_CFLAGS} ${CPPFLAGS} \ - ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \ - ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} + ${CLANG_ANALYZE_CFLAGS} \ + ${.IMPSRC} .cc.clang-analyzer .cpp.clang-analyzer .cxx.clang-analyzer .C.clang-analyzer: ${CXX:N${CCACHE_BIN}} ${CLANG_ANALYZE_CXX_FLAGS} \ - ${CLANG_ANALYZE_CXXFLAGS} ${CPPFLAGS} \ - ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \ - ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} + ${CLANG_ANALYZE_CXXFLAGS} \ + ${.IMPSRC} CLANG_ANALYZE_SRCS= \ ${SRCS:M*.[cC]} ${SRCS:M*.cc} \ diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 4287ff3..3e21db9 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -8,6 +8,7 @@ # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) +.warning COPTS should be CFLAGS. CFLAGS+=${COPTS} .endif diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index c5639b4..8c24107 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -24,7 +24,7 @@ PROGS += ${PROGS_CXX} # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ 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} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v}) |
