diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-05-06 15:34:31 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-05-06 15:34:31 +0000 |
| commit | 428b94492850b39d7f0bf4e2827221780366379c (patch) | |
| tree | a24cf17f2d27faeeade489d27713910202268a07 | |
| parent | 62755d65e5a63215db6d1a7bb0ecc91a0906ada6 (diff) | |
| download | pkgsrc-428b94492850b39d7f0bf4e2827221780366379c.tar.gz | |
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.
| -rwxr-xr-x | bootstrap/bootstrap | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 28676abe994..c314784ecf9 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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> # All rights reserved. @@ -1213,6 +1213,10 @@ run_cmd "(cd ${pkgsrcdir}/pkgtools/bootstrap-mk-files/files && env CP=${cpprog} 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 |