diff options
| -rwxr-xr-x | bootstrap/bootstrap | 6 | ||||
| -rw-r--r-- | devel/bmake/Makefile | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index ab3efeb9409..1f5e40eb16b 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.125 2008/05/23 17:49:52 tnn Exp $ +# $NetBSD: bootstrap,v 1.126 2008/05/23 18:06:44 tnn Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -560,14 +560,12 @@ SunOS) if [ -d "/usr/xpg4/bin" ]; then overpath="/usr/xpg4/bin:$overpath" fi - if [ -x "/usr/xpg4/bin" ]; then - bmakexargs="$bmakexargs --with-defshell=/usr/xpg4/bin/sh" - fi root_group=root need_pax=yes need_bsd_install=no need_awk=yes need_sed=yes + need_ksh=yes set_opsys=no whoamiprog=/usr/ucb/whoami machine_arch=`uname -p | sed -e 's/i86pc/i386/'` diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index 0fe405ab231..859145a222e 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2008/05/23 17:43:31 tnn Exp $ +# $NetBSD: Makefile,v 1.43 2008/05/23 18:06:44 tnn Exp $ # DISTNAME= bmake-20080215 @@ -33,11 +33,7 @@ BOOTSTRAP_ARGS= -q -o ${OPSYS} --prefix=${PREFIX} \ .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "SunOS" && exists(/usr/xpg4/bin/sh) -BOOTSTRAP_ARGS+= --with-defshell=/usr/xpg4/bin/sh -.endif - -.if ${OPSYS} == "OSF1" +.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" DEPENDS+= pdksh-[0-9]*:../../shells/pdksh BOOTSTRAP_ARGS+= --with-defshell=${PREFIX}/bin/pdksh .endif |