[src/trunk]: src/share/mk Now that ctf is fixed for at least amd64, go back t...

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

details:   https://anonhg.NetBSD.org/src/rev/1ffb39bb5ed2
branches:  trunk
changeset: 784113:1ffb39bb5ed2
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 18 19:32:09 2013 +0000

description:
Now that ctf is fixed for at least amd64, go back to an equivalent to the
original functionality, use the tool only if it exists.

diffstat:

 share/mk/bsd.own.mk |   7 ++++++-
 share/mk/sys.mk     |  13 ++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 73ab8ee91e15 -r 1ffb39bb5ed2 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jan 18 18:41:12 2013 +0000
+++ b/share/mk/bsd.own.mk       Fri Jan 18 19:32:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.717 2013/01/11 12:55:29 matt Exp $
+#      $NetBSD: bsd.own.mk,v 1.718 2013/01/18 19:32:09 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -462,6 +462,11 @@
 FC=            ${TOOL_FC.${ACTIVE_FC}}
 OBJC=          ${TOOL_OBJC.${ACTIVE_OBJC}}
 
+.if exists(/usr/bin/${TOOL_CTFCONVERT}) || exists(${TOOL_CTFCONVERT})
+CTFCONVERT=    ${TOOL_CTFCONVERT}
+CTFMERGE=      ${TOOL_CTFMERGE}
+.endif
+
 # OBJCOPY flags to create a.out binaries for old firmware
 # shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
 .if ${MACHINE_CPU} == "arm"
diff -r 73ab8ee91e15 -r 1ffb39bb5ed2 share/mk/sys.mk
--- a/share/mk/sys.mk   Fri Jan 18 18:41:12 2013 +0000
+++ b/share/mk/sys.mk   Fri Jan 18 19:32:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sys.mk,v 1.112 2013/01/17 17:33:16 christos Exp $
+#      $NetBSD: sys.mk,v 1.113 2013/01/18 19:32:09 christos Exp $
 #      @(#)sys.mk      8.2 (Berkeley) 3/21/94
 #
 # This file contains the basic rules for make(1) and is read first
@@ -41,13 +41,12 @@
 LINK.c?=       ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
 
 # C Type Format data is required for DTrace
-# XXX TBD VERSION is not defined
-# XXX Broken: disable, see commit message
-#CTFFLAGS      ?=      -L VERSION
-#CTFMFLAGS     ?=      -t -L VERSION
+CTFFLAGS       ?=      -L VERSION
+CTFMFLAGS      ?=      -t -L VERSION
 
-#CTFCONVERT    ?=      ${TOOL_CTFCONVERT}
-#CTFMERGE      ?=      ${TOOL_CTFMERGE}
+# We don't define these here, we let the bsd.own.mk to do it
+#CTFCONVERT    ?=      ctfconvert
+#CTFMERGE      ?=      ctfmerge
 
 CXX?=          c++
 CXXFLAGS?=     ${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu99:N-Wold-style-definition:N-Wno-format-zero-length}