[src/trunk]: src/share/mk Make sure to define USETOOLS properly always (set i...

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

details:   https://anonhg.NetBSD.org/src/rev/646bd51a9770
branches:  trunk
changeset: 515758:646bd51a9770
user:      tv <tv%NetBSD.org@localhost>
date:      Thu Oct 04 15:52:59 2001 +0000

description:
Make sure to define USETOOLS properly always (set it to "no" on systems
without USE_NEW_TOOLCHAIN).  This will allow conversion of in-tree
conditionals to use only USETOOLS....

diffstat:

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

diffs (39 lines):

diff -r d32f02a81f88 -r 646bd51a9770 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu Oct 04 15:51:32 2001 +0000
+++ b/share/mk/bsd.own.mk       Thu Oct 04 15:52:59 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.183 2001/09/26 12:45:56 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.184 2001/10/04 15:52:59 tv Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -9,7 +9,13 @@
 .include "${MAKECONF}"
 .endif
 
-.ifdef BSD_PKG_MK
+# Temporary; this will become default when all platforms have migrated.
+.if ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "sparc64"
+USE_NEW_TOOLCHAIN=     # set
+.endif
+
+.if defined(BSD_PKG_MK) || !defined(USE_NEW_TOOLCHAIN)
 USETOOLS:=     no
 .endif
 USETOOLS?=     yes
@@ -24,13 +30,7 @@
        @false
 .endif
 
-# Temporary; all USE_NEW_TOOLCHAIN conditionals will be dropped when
-# all platforms have migrated.
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc64"
-USE_NEW_TOOLCHAIN=     # set
-.endif
-
-.if defined(USE_NEW_TOOLCHAIN) && ${USETOOLS} != "no"
+.if ${USETOOLS} != "no"
 # Define default locations for common tools.
 
 AR=            ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar