Follow-up r349065: Fix .TARGET flag ambiguity with PROGS which broke MK_TESTS.
X-MFC-With: r349065 Sponsored by: DellEMC
This commit is contained in:
parent
3109cebc22
commit
8e0c373903
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=349202
@ -234,7 +234,6 @@ DEBUG_FILES_CFLAGS?= -g
|
||||
.if ${MK_WARNS} != "no"
|
||||
CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${COMPILER_TYPE}}
|
||||
CFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
|
||||
CFLAGS+= ${CWARNFLAGS.${.TARGET:T}}
|
||||
.endif
|
||||
|
||||
CFLAGS+= ${CFLAGS.${COMPILER_TYPE}}
|
||||
@ -245,14 +244,23 @@ AFLAGS+= ${AFLAGS.${.TARGET:T}}
|
||||
ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}}
|
||||
ACFLAGS+= ${ACFLAGS.${.TARGET:T}}
|
||||
CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
|
||||
CFLAGS+= ${CFLAGS.${.TARGET:T}}
|
||||
CXXFLAGS+= ${CXXFLAGS.${.IMPSRC:T}}
|
||||
CXXFLAGS+= ${CXXFLAGS.${.TARGET:T}}
|
||||
|
||||
LDFLAGS+= ${LDFLAGS.${LINKER_TYPE}}
|
||||
|
||||
# Only allow .TARGET when not using PROGS as it has the same syntax
|
||||
# per PROG which is ambiguous with this syntax. This is only needed
|
||||
# for PROG_VARS vars.
|
||||
.if !defined(_RECURSING_PROGS)
|
||||
.if ${MK_WARNS} != "no"
|
||||
CFLAGS+= ${CWARNFLAGS.${.TARGET:T}}
|
||||
.endif
|
||||
CFLAGS+= ${CFLAGS.${.TARGET:T}}
|
||||
CXXFLAGS+= ${CXXFLAGS.${.TARGET:T}}
|
||||
LDFLAGS+= ${LDFLAGS.${.TARGET:T}}
|
||||
LDADD+= ${LDADD.${.TARGET:T}}
|
||||
LIBADD+= ${LIBADD.${.TARGET:T}}
|
||||
.endif
|
||||
|
||||
.if defined(SRCTOP)
|
||||
# Prevent rebuilding during install to support read-only objdirs.
|
||||
|
Loading…
Reference in New Issue
Block a user