[src/netbsd-8]: src/share/mk Pull up following revision(s) (requested by mart...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/77e4f6c80357
branches:  netbsd-8
changeset: 434766:77e4f6c80357
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue Mar 20 09:17:42 2018 +0000

description:
Pull up following revision(s) (requested by martin in ticket #647):
        share/mk/bsd.own.mk: revision 1.1051
Don't barf if the ctf tools are not installed.
[perhaps warn?]

diffstat:

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

diffs (19 lines):

diff -r c3a1ab2db47f -r 77e4f6c80357 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Mar 20 09:15:33 2018 +0000
+++ b/share/mk/bsd.own.mk       Tue Mar 20 09:17:42 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1009.2.3 2017/11/27 11:36:29 martin Exp $
+#      $NetBSD: bsd.own.mk,v 1.1009.2.4 2018/03/20 09:17:42 bouyer Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1554,7 +1554,8 @@
 TESTSBASE=     /usr/tests${MLIBDIR:D/${MLIBDIR}}
 
 # Override with tools versions if needed
-.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
+.if ${MKCTF:Uno} != "no" && !defined(NOCTF) && \
+    (exists(${TOOL_CTFCONVERT}) || exists(/usr/bin/${TOOL_CTFCONVERT}))
 CTFCONVERT=    ${TOOL_CTFCONVERT}
 CTFMERGE=      ${TOOL_CTFMERGE}
 .endif