Elide broken exists tests for TOOL_CTFCONVERT and TOOL_CTFMERGE.
Either you set MKCTF=yes and they should exist, or you set MKCTF=no and it doesn't matter. If MKCTF=yes and they don't exist, something is broken, and this should fail noisily, not silently.
This commit is contained in:
parent
3938a82dfd
commit
52c664e0cd
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.own.mk,v 1.793 2014/04/02 22:34:29 joerg Exp $
|
||||
# $NetBSD: bsd.own.mk,v 1.794 2014/04/03 18:29:11 riastradh Exp $
|
||||
|
||||
# This needs to be before bsd.init.mk
|
||||
.if defined(BSD_MK_COMPAT_FILE)
|
||||
|
@ -507,7 +507,7 @@ FC= ${TOOL_FC.${ACTIVE_FC}}
|
|||
OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
|
||||
|
||||
# Override with tools versions if needed
|
||||
.if ${MKCTF:Uno} != "no" && exists(${TOOL_CTFCONVERT}) && exists(${TOOL_CTFMERGE})
|
||||
.if ${MKCTF:Uno} != "no"
|
||||
CTFCONVERT= ${TOOL_CTFCONVERT}
|
||||
CTFMERGE= ${TOOL_CTFMERGE}
|
||||
.endif
|
||||
|
|
Loading…
Reference in New Issue