diff options
| author | asau <asau> | 2014-04-17 18:12:47 +0000 |
|---|---|---|
| committer | asau <asau> | 2014-04-17 18:12:47 +0000 |
| commit | b466f3c3ca5cc3ffbb3faab92cacad15a9a37be5 (patch) | |
| tree | 63041e2082fb09848ca47c85be0f26d1c6c62968 /bootstrap | |
| parent | 1886b11418030c5d3c3e61444194493729438cbf (diff) | |
| download | pkgsrc-b466f3c3ca5cc3ffbb3faab92cacad15a9a37be5.tar.gz | |
The only use of "bmakexenv" variable is on IRIX to pass MAKE=pmake
to devel/bmake when bootstrapping the latter.
bmake doesn't take this environment variable into consideration anyway.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index ce7baaf2fa8..0e468ef97d9 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.205 2014/04/03 09:05:11 obache Exp $ +# $NetBSD: bootstrap,v 1.206 2014/04/17 18:12:47 asau Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -479,7 +479,6 @@ fi overpath="" root_user=root -bmakexenv= bmakexargs= need_extras=no set_machine_arch=no @@ -658,7 +657,6 @@ IRIX*) set_opsys=yes machine_arch=mipseb bmakexargs="MACHINE_ARCH=$machine_arch" - bmakexenv="MAKE=pmake" check_compiler=yes if [ `uname -r` -lt 6 ]; then # IRIX 5's mkdir bails out with an error when trying to create with the -p @@ -1078,7 +1076,7 @@ bootstrap_bmake() { echo_msg "Bootstrapping bmake" copy_src $pkgsrcdir/devel/bmake/files bmake run_cmd "chmod u+x $wrkdir/bmake/configure" - run_cmd "(cd $wrkdir/bmake && env $bmakexenv $shprog ./boot-strap $configure_quiet_flags -q -o bootstrap.$opsys --prefix=$wrkdir --sysconfdir=$wrkdir --mksrc none --with-default-sys-path="$wrkdir/share/mk" $bmakexargs)" + run_cmd "(cd $wrkdir/bmake && $shprog ./boot-strap $configure_quiet_flags -q -o bootstrap.$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/bootstrap.$opsys/bmake $wrkdir/bin/bmake" } bootstrap_bmake |