[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: Use SH for bmake if specified.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47dece23bfc3
branches:  trunk
changeset: 430958:47dece23bfc3
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed May 06 15:34:31 2020 +0000

description:
bootstrap: Use SH for bmake if specified.

Fixes issue seen bootstrapping on Solaris 9 when bash is available and being
used for SH, bmake was still defaulting to /usr/xpg4/bin/sh which dumps core
with some of the mk/check infrastructure.

Note this is only for the bmake used during the initial bootstrap, the final
bmake package will still use the defshell logic in its Makefile.

diffstat:

 bootstrap/bootstrap |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (22 lines):

diff -r 318ee6c48a58 -r 47dece23bfc3 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed May 06 15:11:44 2020 +0000
+++ b/bootstrap/bootstrap       Wed May 06 15:34:31 2020 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.278 2020/04/29 20:27:03 triaxx Exp $
+# $NetBSD: bootstrap,v 1.279 2020/05/06 15:34:31 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1213,6 +1213,10 @@
 ROOT_USER=${root_user} SED=${sedprog} SYSCONFDIR=${sysconfdir} \
 $shprog ./bootstrap.sh)"
 
+if [ -n "${bootstrap_sh_set}" ]; then
+       bmakexargs="${bmakexargs} --with-defshell=${bootstrap_sh}"
+fi
+
 bootstrap_bmake() {
        echo_msg "Bootstrapping bmake"
        copy_src $pkgsrcdir/devel/bmake/files bmake