summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorsketch <sketch>2008-06-11 12:47:07 +0000
committersketch <sketch>2008-06-11 12:47:07 +0000
commit8ee34883f80ebd186a0ef8cb7ec30a7192751c6e (patch)
treec1bf257ec318ed51d2e561802c6d28187ce4db2b /bootstrap
parent863774c685583d613c676284fe511ef9314dfbe6 (diff)
downloadpkgsrc-8ee34883f80ebd186a0ef8cb7ec30a7192751c6e.tar.gz
If $need_ksh, set TOOLS_PLATFORM.ksh too, else packages with USE_TOOLS+=ksh
overwrite the installed dependancy, breaking bulk builds.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bootstrap4
1 files changed, 3 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 0e80cb046e7..4ffcd9a3153 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.127 2008/05/24 13:38:33 tnn Exp $
+# $NetBSD: bootstrap,v 1.128 2008/06/11 12:47:07 sketch Exp $
#
#
# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
@@ -907,6 +907,8 @@ yes) echo_msg "Bootstrapping ksh"
run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/ksh/ksh $wrkdir/bin/pdksh"
echo "TOOLS_PLATFORM.sh?= $prefix/bin/pdksh" >> ${TARGET_MKCONF}
echo "TOOLS_PLATFORM.sh?= $wrkdir/bin/pdksh" >> ${BOOTSTRAP_MKCONF}
+ echo "TOOLS_PLATFORM.ksh?= $prefix/bin/pdksh" >> ${TARGET_MKCONF}
+ echo "TOOLS_PLATFORM.ksh?= $wrkdir/bin/pdksh" >> ${BOOTSTRAP_MKCONF}
# Now rebootstrap bmake for ksh
echo_msg "Rebootstrapping bmake for ksh"
bmakexargs="$bmakexargs --with-defshell=$wrkdir/bin/pdksh"