Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/mk Elide broken exists tests for TOOL_CTFCONVERT and T...



details:   https://anonhg.NetBSD.org/src/rev/e1240859fb43
branches:  trunk
changeset: 795195:e1240859fb43
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Apr 03 18:29:11 2014 +0000

description:
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.

diffstat:

 share/mk/bsd.own.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 62c657774406 -r e1240859fb43 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Apr 03 18:27:37 2014 +0000
+++ b/share/mk/bsd.own.mk       Thu Apr 03 18:29:11 2014 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index