[src/trunk]: src/tools/make Do not use HOST_CFLAGS and others. build.sh call...

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

details:   https://anonhg.NetBSD.org/src/rev/fe3531cb6e05
branches:  trunk
changeset: 829076:fe3531cb6e05
user:      uwe <uwe%NetBSD.org@localhost>
date:      Tue Jan 16 08:53:51 2018 +0000

description:
Do not use HOST_CFLAGS and others.  build.sh calls configure with
CFLAGS set to HOST_CFLAGS, etc - so HOST_* environment variables are
already taken into account if set.

OTOH, if configure were to add anything to CFLAGS etc, the old code
would happily ignore those changes, picking up original environment
variables instead.

diffstat:

 tools/make/buildmake.sh.in |  21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r 69e75de9e8e0 -r fe3531cb6e05 tools/make/buildmake.sh.in
--- a/tools/make/buildmake.sh.in        Tue Jan 16 08:39:29 2018 +0000
+++ b/tools/make/buildmake.sh.in        Tue Jan 16 08:53:51 2018 +0000
@@ -1,25 +1,28 @@
 #! /bin/sh
-#      $NetBSD: buildmake.sh.in,v 1.11 2018/01/15 20:14:49 uwe Exp $
+#      $NetBSD: buildmake.sh.in,v 1.12 2018/01/16 08:53:51 uwe Exp $
 #
 # buildmake.sh.in - Autoconf-processed shell script for building make(1).
 #
 
 : ${NETBSDSRCDIR:=@srcdir@/../..}
+MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
 
-: ${HOST_CC="@CC@"}
-: ${HOST_CFLAGS="@CPPFLAGS@ @CFLAGS@"}
-: ${HOST_LDFLAGS="@LDFLAGS@ @LIBS@"}
+_CC="@CC@"
+
+_CFLAGS="@CPPFLAGS@"
+_CFLAGS="${_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
+_CFLAGS="${_CFLAGS} @DEFS@"
+_CFLAGS="${_CFLAGS} @CFLAGS@"
+
+_LDFLAGS="@LDFLAGS@ @LIBS@"
 
 docmd () {
        echo "$1"
        $1 || exit 1
 }
 
-MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
-HOST_CFLAGS="${HOST_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
-
 for f in $MKSRCDIR/*.c $MKSRCDIR/lst.lib/*.c; do
-       docmd "${HOST_CC} ${HOST_CFLAGS} @DEFS@ -c $f"
+       docmd "${_CC} ${_CFLAGS} -c $f"
 done
 
-docmd "${HOST_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${HOST_LDFLAGS}"
+docmd "${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"