shithub: mc

Download patch

ref: 0eae465b2ba82f8a0e49c869bddd37b85ec2e5ae
parent: 57d9a13a1046c79a3393317c47f93ebb54807786
author: Ori Bernstein <ori@eigenstate.org>
date: Sat Mar 18 18:44:09 EDT 2017

Update bootstrap scripts.

--- a/mk/bootstrap/bootstrap+Darwin-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Darwin-x86_64.sh
@@ -48,6 +48,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . htab.myr  && 	$pwd/6/6m	-I ../sys -I . htab.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . intparse.myr  && 	$pwd/6/6m	-I ../sys -I . intparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . introspect.myr  && 	$pwd/6/6m	-I ../sys -I . introspect.myr  &&\
+echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . strsplit.myr  && 	$pwd/6/6m	-I ../sys -I . strsplit.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . syswrap-ss+osx.myr  && 	$pwd/6/6m	-I ../sys -I . syswrap-ss+osx.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . varargs.myr  && 	$pwd/6/6m	-I ../sys -I . varargs.myr  &&\
@@ -69,7 +70,6 @@
 echo 	$pwd/6/6m	-I ../sys -I . dir+osx.myr  && 	$pwd/6/6m	-I ../sys -I . dir+osx.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . ipparse.myr  && 	$pwd/6/6m	-I ../sys -I . ipparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . endian.myr  && 	$pwd/6/6m	-I ../sys -I . endian.myr  &&\
-echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . iterutil.myr  && 	$pwd/6/6m	-I ../sys -I . iterutil.myr  &&\
--- a/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+FreeBSD-amd64.sh
@@ -48,6 +48,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . htab.myr  && 	$pwd/6/6m	-I ../sys -I . htab.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . intparse.myr  && 	$pwd/6/6m	-I ../sys -I . intparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . introspect.myr  && 	$pwd/6/6m	-I ../sys -I . introspect.myr  &&\
+echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . strsplit.myr  && 	$pwd/6/6m	-I ../sys -I . strsplit.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . syswrap-ss+freebsd.myr  && 	$pwd/6/6m	-I ../sys -I . syswrap-ss+freebsd.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . varargs.myr  && 	$pwd/6/6m	-I ../sys -I . varargs.myr  &&\
@@ -69,7 +70,6 @@
 echo 	$pwd/6/6m	-I ../sys -I . dir+freebsd.myr  && 	$pwd/6/6m	-I ../sys -I . dir+freebsd.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . ipparse.myr  && 	$pwd/6/6m	-I ../sys -I . ipparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . endian.myr  && 	$pwd/6/6m	-I ../sys -I . endian.myr  &&\
-echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . iterutil.myr  && 	$pwd/6/6m	-I ../sys -I . iterutil.myr  &&\
--- a/mk/bootstrap/bootstrap+Linux-x86_64.sh
+++ b/mk/bootstrap/bootstrap+Linux-x86_64.sh
@@ -48,6 +48,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . htab.myr  && 	$pwd/6/6m	-I ../sys -I . htab.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . intparse.myr  && 	$pwd/6/6m	-I ../sys -I . intparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . introspect.myr  && 	$pwd/6/6m	-I ../sys -I . introspect.myr  &&\
+echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . strsplit.myr  && 	$pwd/6/6m	-I ../sys -I . strsplit.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . syswrap-ss+linux.myr  && 	$pwd/6/6m	-I ../sys -I . syswrap-ss+linux.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . varargs.myr  && 	$pwd/6/6m	-I ../sys -I . varargs.myr  &&\
@@ -69,7 +70,6 @@
 echo 	$pwd/6/6m	-I ../sys -I . dir+linux.myr  && 	$pwd/6/6m	-I ../sys -I . dir+linux.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . ipparse.myr  && 	$pwd/6/6m	-I ../sys -I . ipparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . endian.myr  && 	$pwd/6/6m	-I ../sys -I . endian.myr  &&\
-echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . iterutil.myr  && 	$pwd/6/6m	-I ../sys -I . iterutil.myr  &&\
--- a/mk/bootstrap/bootstrap+NetBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+NetBSD-amd64.sh
@@ -10,8 +10,8 @@
 echo 	$pwd/6/6m	setup+posixy.myr  && 	$pwd/6/6m	setup+posixy.myr  &&\
 echo 	as	-g -o syscall.o syscall+netbsd-x64.s  && 	as	-g -o syscall.o syscall+netbsd-x64.s  &&\
 echo 	$pwd/6/6m	ifreq+netbsd.myr  && 	$pwd/6/6m	ifreq+netbsd.myr  &&\
-echo 	$pwd/muse/muse	-o libsys.use -p sys sys.use syserrno.use setup.use systypes.use ifreq.use  && 	$pwd/muse/muse	-o libsys.use -p sys sys.use syserrno.use setup.use systypes.use ifreq.use  &&\
-echo 	ar	-rcs libsys.a sys.o syscall.o syserrno.o util.o setup.o systypes.o ifreq.o  && 	ar	-rcs libsys.a sys.o syscall.o syserrno.o util.o setup.o systypes.o ifreq.o  &&\
+echo 	$pwd/muse/muse	-o libsys.use -p sys ifreq.use setup.use syserrno.use systypes.use sys.use  && 	$pwd/muse/muse	-o libsys.use -p sys ifreq.use setup.use syserrno.use systypes.use sys.use  &&\
+echo 	ar	-rcs libsys.a ifreq.o syscall.o util.o setup.o syserrno.o systypes.o sys.o  && 	ar	-rcs libsys.a ifreq.o syscall.o util.o setup.o syserrno.o systypes.o sys.o  &&\
 echo 	cd $pwd/lib/std && 	cd $pwd/lib/std &&\
 echo 	$pwd/6/6m	-I ../sys -I . types.myr  && 	$pwd/6/6m	-I ../sys -I . types.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . cstrconv.myr  && 	$pwd/6/6m	-I ../sys -I . cstrconv.myr  &&\
@@ -48,7 +48,8 @@
 echo 	$pwd/6/6m	-I ../sys -I . htab.myr  && 	$pwd/6/6m	-I ../sys -I . htab.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . intparse.myr  && 	$pwd/6/6m	-I ../sys -I . intparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . introspect.myr  && 	$pwd/6/6m	-I ../sys -I . introspect.myr  &&\
-echo 	$pwd/6/6m	-I ../sys -I . strsplit.mye  && 	$pwd/6/6m	-I ../sys -I . strsplit.myr  &&\
+echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
+echo 	$pwd/6/6m	-I ../sys -I . strsplit.myr  && 	$pwd/6/6m	-I ../sys -I . strsplit.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . syswrap-ss+netbsd.myr  && 	$pwd/6/6m	-I ../sys -I . syswrap-ss+netbsd.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . varargs.myr  && 	$pwd/6/6m	-I ../sys -I . varargs.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . writeall.myr  && 	$pwd/6/6m	-I ../sys -I . writeall.myr  &&\
@@ -69,7 +70,6 @@
 echo 	$pwd/6/6m	-I ../sys -I . dir+netbsd.myr  && 	$pwd/6/6m	-I ../sys -I . dir+netbsd.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . ipparse.myr  && 	$pwd/6/6m	-I ../sys -I . ipparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . endian.myr  && 	$pwd/6/6m	-I ../sys -I . endian.myr  &&\
-echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . iterutil.myr  && 	$pwd/6/6m	-I ../sys -I . iterutil.myr  &&\
@@ -101,8 +101,8 @@
 echo 	$pwd/6/6m	-I ../sys -I . swap.myr  && 	$pwd/6/6m	-I ../sys -I . swap.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . sjlj.myr  && 	$pwd/6/6m	-I ../sys -I . sjlj.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . dial+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . dial+posixy.myr  &&\
-echo 	$pwd/muse/muse	-o libstd.use -p std dial.use fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use dir.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use  && 	$pwd/muse/muse	-o libstd.use -p std dial.use fmtfuncs.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use dir.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use syswrap-ss.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use  &&\
-echo 	ar	-rcs libstd.a dial.o fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o dir.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o syswrap-ss.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o  && 	ar	-rcs libstd.a dial.o fmtfuncs.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o dir.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o syswrap-ss.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o  &&\
+echo 	$pwd/muse/muse	-o libstd.use -p std dial.use fmtfuncs.use syswrap-ss.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use dir.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use  && 	$pwd/muse/muse	-o libstd.use -p std dial.use fmtfuncs.use syswrap-ss.use fmt.use try.use pathjoin.use strjoin.use sljoin.use slpush.use strstrip.use htab.use now.use getcwd.use rand.use dir.use slurp.use varargs.use listen.use strbuf.use clear.use slput.use strsplit.use introspect.use mktemp.use alloc.use optparse.use memops.use bytealloc.use fltbits.use striter.use sldup.use fltfmt.use extremum.use option.use errno.use wait.use slcp.use writeall.use putint.use consts.use syswrap.use sleep.use readall.use sort.use blat.use diriter.use sjlj.use fltparse.use backtrace.use mk.use swap.use hassuffix.use execvp.use ipparse.use types.use slpop.use strfind.use utf.use dialparse.use cstrconv.use search.use die.use units.use result.use bitset.use env.use resolve.use intparse.use hasprefix.use mkpath.use getint.use dirname.use sleq.use endian.use iterutil.use spork.use assert.use cmp.use chartype.use bigint.use hashfuncs.use slfill.use threadhooks.use fndup.use chomp.use  &&\
+echo 	ar	-rcs libstd.a dial.o fmtfuncs.o syswrap-ss.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o dir.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o  && 	ar	-rcs libstd.a dial.o fmtfuncs.o syswrap-ss.o fmt.o try.o pathjoin.o strjoin.o memops-impl.o sljoin.o slpush.o strstrip.o htab.o now.o getbp.o getcwd.o rand.o dir.o slurp.o varargs.o listen.o strbuf.o clear.o slput.o strsplit.o introspect.o mktemp.o alloc.o optparse.o memops.o bytealloc.o fltbits.o striter.o sldup.o fltfmt.o extremum.o option.o errno.o wait.o slcp.o writeall.o putint.o consts.o syswrap.o sleep.o readall.o sort.o blat.o diriter.o sjlj.o fltparse.o backtrace.o mk.o swap.o hassuffix.o execvp.o ipparse.o types.o slpop.o strfind.o utf.o dialparse.o cstrconv.o search.o die.o units.o result.o bitset.o env.o resolve.o intparse.o hasprefix.o mkpath.o getint.o dirname.o sleq.o endian.o iterutil.o spork.o assert.o cmp.o sjlj-impl.o chartype.o bigint.o hashfuncs.o slfill.o threadhooks.o fndup.o chomp.o  &&\
 echo 	cd $pwd/lib/regex && 	cd $pwd/lib/regex &&\
 echo 	$pwd/6/6m	-I ../std -I ../sys types.myr  && 	$pwd/6/6m	-I ../std -I ../sys types.myr  &&\
 echo 	$pwd/6/6m	-I ../std -I ../sys interp.myr  && 	$pwd/6/6m	-I ../std -I ../sys interp.myr  &&\
--- a/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
+++ b/mk/bootstrap/bootstrap+OpenBSD-amd64.sh
@@ -48,6 +48,7 @@
 echo 	$pwd/6/6m	-I ../sys -I . htab.myr  && 	$pwd/6/6m	-I ../sys -I . htab.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . intparse.myr  && 	$pwd/6/6m	-I ../sys -I . intparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . introspect.myr  && 	$pwd/6/6m	-I ../sys -I . introspect.myr  &&\
+echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . strsplit.myr  && 	$pwd/6/6m	-I ../sys -I . strsplit.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . syswrap-ss+openbsd.myr  && 	$pwd/6/6m	-I ../sys -I . syswrap-ss+openbsd.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . varargs.myr  && 	$pwd/6/6m	-I ../sys -I . varargs.myr  &&\
@@ -69,7 +70,6 @@
 echo 	$pwd/6/6m	-I ../sys -I . dir+openbsd.myr  && 	$pwd/6/6m	-I ../sys -I . dir+openbsd.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . ipparse.myr  && 	$pwd/6/6m	-I ../sys -I . ipparse.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . endian.myr  && 	$pwd/6/6m	-I ../sys -I . endian.myr  &&\
-echo 	$pwd/6/6m	-I ../sys -I . strstrip.myr  && 	$pwd/6/6m	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . resolve+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  && 	$pwd/6/6m	-I ../sys -I . dialparse+posixy.myr  &&\
 echo 	$pwd/6/6m	-I ../sys -I . iterutil.myr  && 	$pwd/6/6m	-I ../sys -I . iterutil.myr  &&\
--- a/mk/bootstrap/bootstrap+Plan9-amd64.sh
+++ b/mk/bootstrap/bootstrap+Plan9-amd64.sh
@@ -48,6 +48,7 @@
 echo 	$pwd/6/6.out	-I ../sys -I . htab.myr  && 	$pwd/6/6.out	-I ../sys -I . htab.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . intparse.myr  && 	$pwd/6/6.out	-I ../sys -I . intparse.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . introspect.myr  && 	$pwd/6/6.out	-I ../sys -I . introspect.myr  &&\
+echo 	$pwd/6/6.out	-I ../sys -I . strstrip.myr  && 	$pwd/6/6.out	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . strsplit.myr  && 	$pwd/6/6.out	-I ../sys -I . strsplit.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . varargs.myr  && 	$pwd/6/6.out	-I ../sys -I . varargs.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . writeall.myr  && 	$pwd/6/6.out	-I ../sys -I . writeall.myr  &&\
@@ -88,7 +89,6 @@
 echo 	$pwd/6/6.out	-I ../sys -I . bitset.myr  && 	$pwd/6/6.out	-I ../sys -I . bitset.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . fmtfuncs.myr  && 	$pwd/6/6.out	-I ../sys -I . fmtfuncs.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . sleep.myr  && 	$pwd/6/6.out	-I ../sys -I . sleep.myr  &&\
-echo 	$pwd/6/6.out	-I ../sys -I . strstrip.myr  && 	$pwd/6/6.out	-I ../sys -I . strstrip.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . try.myr  && 	$pwd/6/6.out	-I ../sys -I . try.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . sort.myr  && 	$pwd/6/6.out	-I ../sys -I . sort.myr  &&\
 echo 	$pwd/6/6.out	-I ../sys -I . search.myr  && 	$pwd/6/6.out	-I ../sys -I . search.myr  &&\