[src/trunk]: src/share/mk redo the ctf stuff to handle the USETOOLS=never cas...

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

details:   https://anonhg.NetBSD.org/src/rev/34591c44f6d9
branches:  trunk
changeset: 792348:34591c44f6d9
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 31 18:46:09 2013 +0000

description:
redo the ctf stuff to handle the USETOOLS=never case correctly and explain
how.

diffstat:

 share/mk/bsd.own.mk |   5 +++--
 share/mk/sys.mk     |  11 +++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r dd97a7397ef5 -r 34591c44f6d9 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Dec 31 17:35:45 2013 +0000
+++ b/share/mk/bsd.own.mk       Tue Dec 31 18:46:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.759 2013/12/16 19:06:41 skrll Exp $
+#      $NetBSD: bsd.own.mk,v 1.760 2013/12/31 18:46:09 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -481,7 +481,8 @@
 FC=            ${TOOL_FC.${ACTIVE_FC}}
 OBJC=          ${TOOL_OBJC.${ACTIVE_OBJC}}
 
-.if exists(/usr/bin/${TOOL_CTFCONVERT}) || exists(${TOOL_CTFCONVERT})
+# Override with tools versions if needed
+.if exists(${TOOL_CTFCONVERT}) && exists(${TOOL_CTFMERGE})
 CTFCONVERT=    ${TOOL_CTFCONVERT}
 CTFMERGE=      ${TOOL_CTFMERGE}
 .endif
diff -r dd97a7397ef5 -r 34591c44f6d9 share/mk/sys.mk
--- a/share/mk/sys.mk   Tue Dec 31 17:35:45 2013 +0000
+++ b/share/mk/sys.mk   Tue Dec 31 18:46:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sys.mk,v 1.118 2013/11/01 17:07:37 christos Exp $
+#      $NetBSD: sys.mk,v 1.119 2013/12/31 18:46:09 christos Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 #
 # This file contains the basic rules for make(1) and is read first
@@ -46,9 +46,12 @@
 CTFFLAGS       ?=      -g -L VERSION
 CTFMFLAGS      ?=      -g -t -L VERSION
 
-# We don't define these here, we let the bsd.own.mk to do it
-#CTFCONVERT    ?=      ctfconvert
-#CTFMERGE      ?=      ctfmerge
+# We have to define these here, because if we don't the rules below will
+# not work
+.if exists(/usr/bin/ctfconvert) && exists(/usr/bin/ctfmerge)
+CTFCONVERT     ?=      ctfconvert
+CTFMERGE       ?=      ctfmerge
+.endif
 
 CXX?=          c++
 CXXFLAGS?=     ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu[0-9][0-9]:N-Wold-style-definition:N-Wno-format-zero-length}