Make sure any -U CFLAGS are not filtered out when calling mkdep, as
gnu/usr.bin/cc/libiberty first defines the PREFIX macro, and then undefines it again, so mkdep with clang complains. Submitted by: Dimitry Andric <dimitry at andric.com> Reviewed by: ru
This commit is contained in:
parent
e0e08e6a60
commit
efdcc3d8d8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=211427
@ -126,13 +126,13 @@ depend: beforedepend ${DEPENDFILE} afterdepend
|
||||
# Different types of sources are compiled with slightly different flags.
|
||||
# Split up the sources, and filter out headers and non-applicable flags.
|
||||
.if ${CC} == "icc"
|
||||
MKDEP_CFLAGS= ${CFLAGS:M-X*} ${CFLAGS:M-[BID]*}
|
||||
MKDEP_CXXFLAGS= ${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BID]*}
|
||||
MKDEP_OBJCFLAGS=${OBJCFLAGS:M-X*} ${OBJCFLAGS:M-[BID]*}
|
||||
MKDEP_CFLAGS= ${CFLAGS:M-X*} ${CFLAGS:M-[BIDU]*}
|
||||
MKDEP_CXXFLAGS= ${CXXFLAGS:M-X*} ${CXXFLAGS:M-[BIDU]*}
|
||||
MKDEP_OBJCFLAGS=${OBJCFLAGS:M-X*} ${OBJCFLAGS:M-[BIDU]*}
|
||||
.else
|
||||
MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*}
|
||||
MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*}
|
||||
MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} ${OBJCFLAGS:M-Wno-import*}
|
||||
MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BIDU]*}
|
||||
MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*}
|
||||
MKDEP_OBJCFLAGS=${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BIDU]*} ${OBJCFLAGS:M-Wno-import*}
|
||||
.endif
|
||||
|
||||
DPSRCS+= ${SRCS}
|
||||
|
Loading…
Reference in New Issue
Block a user