Source-Changes-HG archive

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

[src/trunk]: src/share/mk Don't barf if the ctf tools are not installed.



details:   https://anonhg.NetBSD.org/src/rev/725c5e43a6c9
branches:  trunk
changeset: 321415:725c5e43a6c9
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Mar 15 13:44:45 2018 +0000

description:
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 71160d0b9fdf -r 725c5e43a6c9 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Mar 15 09:17:31 2018 +0000
+++ b/share/mk/bsd.own.mk       Thu Mar 15 13:44:45 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1050 2018/03/14 23:41:05 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1051 2018/03/15 13:44:45 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1594,7 +1594,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



Home | Main Index | Thread Index | Old Index