[src/trunk]: src Set USETOOLS and MAKEWRAPPERMACHINE in parseoptions(), where

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

details:   https://anonhg.NetBSD.org/src/rev/a6a6a2cc71fd
branches:  trunk
changeset: 330374:a6a6a2cc71fd
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Jul 06 17:49:20 2014 +0000

description:
Set USETOOLS and MAKEWRAPPERMACHINE in parseoptions(), where
several other make variables are set, insteadof in special
case code in createmakewrapper().

diffstat:

 build.sh |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 4603b770867f -r a6a6a2cc71fd build.sh
--- a/build.sh  Sun Jul 06 17:35:09 2014 +0000
+++ b/build.sh  Sun Jul 06 17:49:20 2014 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.283 2014/07/06 17:35:09 apb Exp $
+#      $NetBSD: build.sh,v 1.284 2014/07/06 17:49:20 apb Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1278,6 +1278,8 @@
        MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
        MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
        export MAKEFLAGS MACHINE MACHINE_ARCH
+       setmakeenv USETOOLS "yes"
+       setmakeenv MAKEWRAPPERMACHINE "${makewrappermachine:-${MACHINE}}"
 }
 
 # sanitycheck --
@@ -1748,7 +1750,7 @@
        eval cat <<EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.283 2014/07/06 17:35:09 apb Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.284 2014/07/06 17:49:20 apb Exp $
 # with these arguments: ${_args}
 #
 
@@ -1763,8 +1765,6 @@
                done
 
                eval cat <<EOF
-MAKEWRAPPERMACHINE=${makewrappermachine:-${MACHINE}}; export MAKEWRAPPERMACHINE
-USETOOLS=yes; export USETOOLS
 EOF
        } | eval sort -u "${makewrapout}"
        eval cat <<EOF "${makewrapout}"