bmake is supposed to be standalone and we don't document a requirement

of make, so build libnbcompat after bmake using bmake.

1 files changed, 11 insertions, 11 deletions

diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 903fa2d4185..1ed998dd7c4 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.135 2008/07/31 13:42:57 joerg Exp $
+# $NetBSD: bootstrap,v 1.136 2008/10/14 22:50:54 joerg Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -809,15 +809,6 @@ PKG_DBDIR=$pkgdbdir; export PKG_DBDIR
 LOCALBASE=$prefix; export LOCALBASE
 VARBASE=$varbase; export VARBASE
 
-# build libnbcompat
-echo_msg "Building libnbcompat"
-copy_src $pkgsrcdir/pkgtools/libnbcompat/files libnbcompat
-run_cmd "(cd $wrkdir/libnbcompat; $shprog ./configure $configure_quiet_flags -C --prefix=$prefix --mandir=$mandir --sysconfdir=$sysconfdir && make $make_quiet_flags)"
-
-if [ x"$needfnmatchh" = x"yes" ]; then
-	$lnprog -s nbcompat/fnmatch.h $wrkdir/libnbcompat/fnmatch.h
-fi
-
 # set up an example mk.conf file
 TARGET_MKCONF=${wrkdir}/mk.conf.example
 echo_msg "Creating default mk.conf. in ${wrkdir}"
@@ -905,13 +896,22 @@ $shprog ./bootstrap.sh)"
 bootstrap_bmake() {
 	echo_msg "Bootstrapping bmake"
 	copy_src $pkgsrcdir/devel/bmake/files bmake
-	run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $bmakexenv $shprog ./boot-strap $configure_quiet_flags -q -o $opsys --prefix=$wrkdir --sysconfdir=$wrkdir --mksrc none --with-default-sys-path="$wrkdir/share/mk" $bmakexargs)"
+	run_cmd "(cd $wrkdir/bmake && env $bmakexenv $shprog ./boot-strap $configure_quiet_flags -q -o $opsys --prefix=$wrkdir --sysconfdir=$wrkdir --mksrc none --with-default-sys-path="$wrkdir/share/mk" $bmakexargs)"
 	run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/bmake/$opsys/bmake $wrkdir/bin/bmake"
 }
 bootstrap_bmake
 
 bmake="$wrkdir/bin/bmake $make_quiet_flags"
 
+# build libnbcompat
+echo_msg "Building libnbcompat"
+copy_src $pkgsrcdir/pkgtools/libnbcompat/files libnbcompat
+run_cmd "(cd $wrkdir/libnbcompat; $shprog ./configure $configure_quiet_flags -C --prefix=$prefix --mandir=$mandir --sysconfdir=$sysconfdir && $bmake $make_quiet_flags)"
+
+if [ x"$needfnmatchh" = x"yes" ]; then
+	$lnprog -s nbcompat/fnmatch.h $wrkdir/libnbcompat/fnmatch.h
+fi
+
 # bootstrap ksh if necessary
 case "$need_ksh" in
 yes)	echo_msg "Bootstrapping ksh"