Module Name: src
Committed By: uwe
Date: Mon Jan 15 19:52:54 UTC 2018
Modified Files:
src: build.sh
src/tools/make: buildmake.sh.in
Log Message:
Make sure nbmake is always built with the right _PATH_DEFSYSPATH.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/build.sh
cvs rdiff -u -r1.8 -r1.9 src/tools/make/buildmake.sh.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.321 src/build.sh:1.322
--- src/build.sh:1.321 Sun Oct 8 01:05:13 2017
+++ src/build.sh Mon Jan 15 19:52:54 2018
@@ -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 @@ rebuildmake()
${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 @@ createmakewrapper()
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}
#
Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.8 src/tools/make/buildmake.sh.in:1.9
--- src/tools/make/buildmake.sh.in:1.8 Sat Aug 26 22:17:48 2006
+++ src/tools/make/buildmake.sh.in Mon Jan 15 19:52:54 2018
@@ -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 @@ docmd () {
$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"
