[src/trunk]: src Make sure nbmake is always built with the right _PATH_DEFSYS...

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

details:   https://anonhg.NetBSD.org/src/rev/ddd96b600ae3
branches:  trunk
changeset: 829054:ddd96b600ae3
user:      uwe <uwe%NetBSD.org@localhost>
date:      Mon Jan 15 19:52:54 2018 +0000

description:
Make sure nbmake is always built with the right _PATH_DEFSYSPATH.

diffstat:

 build.sh                   |  6 +++---
 tools/make/buildmake.sh.in |  7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 6d699618679c -r ddd96b600ae3 build.sh
--- a/build.sh  Mon Jan 15 19:01:55 2018 +0000
+++ b/build.sh  Mon Jan 15 19:52:54 2018 +0000
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#      $NetBSD: build.sh,v 1.321 2017/10/08 01:05:13 kre Exp $
+#      $NetBSD: build.sh,v 1.322 2018/01/15 19:52:54 uwe Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1664,7 +1664,7 @@
        ${runcmd} env \
 \
 CC="${HOST_CC-cc}" \
-CPPFLAGS="${HOST_CPPFLAGS} -D_PATH_DEFSYSPATH="'\"'${NETBSDSRCDIR}/share/mk'\"' \
+CPPFLAGS="${HOST_CPPFLAGS}" \
 CFLAGS="${HOST_CFLAGS--O}" \
 LDFLAGS="${HOST_LDFLAGS}" \
 \
@@ -1938,7 +1938,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.321 2017/10/08 01:05:13 kre Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.322 2018/01/15 19:52:54 uwe Exp $
 # with these arguments: ${_args}
 #
 
diff -r 6d699618679c -r ddd96b600ae3 tools/make/buildmake.sh.in
--- a/tools/make/buildmake.sh.in        Mon Jan 15 19:01:55 2018 +0000
+++ b/tools/make/buildmake.sh.in        Mon Jan 15 19:52:54 2018 +0000
@@ -1,9 +1,11 @@
 #! /bin/sh
-#      $NetBSD: buildmake.sh.in,v 1.8 2006/08/26 22:17:48 christos Exp $
+#      $NetBSD: buildmake.sh.in,v 1.9 2018/01/15 19:52:54 uwe Exp $
 #
 # buildmake.sh.in - Autoconf-processed shell script for building make(1).
 #
 
+: ${NETBSDSRCDIR:=@srcdir@/../..}
+
 : ${HOST_CC="@CC@"}
 : ${HOST_CFLAGS="@CPPFLAGS@ @CFLAGS@"}
 : ${HOST_LDFLAGS="@LDFLAGS@ @LIBS@"}
@@ -14,7 +16,8 @@
        $1 || exit 1
 }
 
-MKSRCDIR=@srcdir@/../../usr.bin/make
+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"