[src/trunk]: src/share/mk Don't test dtrace-related variables until after the...

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

details:   https://anonhg.NetBSD.org/src/rev/f06f64572f61
branches:  trunk
changeset: 343479:f06f64572f61
user:      riz <riz%NetBSD.org@localhost>
date:      Sat Feb 06 16:56:23 2016 +0000

description:
Don't test dtrace-related variables until after they've been set.

diffstat:

 share/mk/bsd.own.mk |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r c099ccd5cc6b -r f06f64572f61 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Feb 06 15:36:36 2016 +0000
+++ b/share/mk/bsd.own.mk       Sat Feb 06 16:56:23 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.896 2016/02/03 15:28:02 christos Exp $
+#      $NetBSD: bsd.own.mk,v 1.897 2016/02/06 16:56:23 riz Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -351,6 +351,7 @@
 TOOL_CRUNCHGEN=                MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
 TOOL_CTAGS=            ${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
 TOOL_CTFCONVERT=       ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
+TOOL_CTFDUMP=          ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfdump
 TOOL_CTFMERGE=         ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
 TOOL_CVSLATEST=                ${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
 TOOL_DB=               ${TOOLDIR}/bin/${_TOOL_PREFIX}db
@@ -463,6 +464,7 @@
 TOOL_CRUNCHGEN=                crunchgen
 TOOL_CTAGS=            ctags
 TOOL_CTFCONVERT=       ctfconvert
+TOOL_CTFDUMP=          ctfdump
 TOOL_CTFMERGE=         ctfmerge
 TOOL_CVSLATEST=                cvslatest
 TOOL_DB=               db
@@ -567,12 +569,6 @@
 FC=            ${TOOL_FC.${ACTIVE_FC}}
 OBJC=          ${TOOL_OBJC.${ACTIVE_OBJC}}
 
-# Override with tools versions if needed
-.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
-CTFCONVERT=    ${TOOL_CTFCONVERT}
-CTFMERGE=      ${TOOL_CTFMERGE}
-.endif
-
 # For each ${MACHINE_CPU}, list the ports that use it.
 MACHINES.aarch64=      evbarm64
 MACHINES.alpha=                alpha
@@ -1477,4 +1473,10 @@
 
 TESTSBASE=     /usr/tests${MLIBDIR:D/${MLIBDIR}}
 
+# Override with tools versions if needed
+.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
+CTFCONVERT=    ${TOOL_CTFCONVERT}
+CTFMERGE=      ${TOOL_CTFMERGE}
+.endif
+
 .endif # !defined(_BSD_OWN_MK_)