From 0d69d16bcff3fcc1223584a18eaf288cbea9cdad Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 13 Jun 2015 13:15:39 +0000 Subject: If "/usr/bin/bash" is installed under Solaris always prefer it over the "pdksh" package. Using the package is too problematic, see PR pkg/39524. --- bootstrap/bootstrap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 712feb74c48..2eec7405714 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.217 2015/06/04 15:48:45 sevan Exp $ +# $NetBSD: bootstrap,v 1.218 2015/06/13 13:15:39 tron Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -804,7 +804,7 @@ SunOS) else need_sed=yes fi - if [ "`uname -r`" = "5.11" -a -x "/usr/bin/bash" ]; then + if [ -x "/usr/bin/bash" ]; then bootstrap_sh=${SH:-/usr/bin/bash} bootstrap_sh_set=set else -- cgit v1.2.3