mc: Update to latest git

5 files changed, 13 insertions, 4 deletions

diff --git a/pkg/mc/bld.ninja b/pkg/mc/bld.ninja
index 1df2d101..32990ddb 100644
--- a/pkg/mc/bld.ninja
+++ b/pkg/mc/bld.ninja
@@ -246,6 +246,15 @@ build $outdir/lib/escfmt/libescfmt.use: muse $outdir/lib/escfmt/escsh.use $outdi
 build $outdir/support/dumpleak.o | $outdir/support/dumpleak.use: mc $srcdir/support/dumpleak.myr | $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use $outdir/lib/bio/libbio.use $outdir/lib/regex/libregex.use
   mcdir = $outdir/support
 build $outdir/support/mdumpleak: ld $outdir/_myrrt.o $outdir/support/dumpleak.o $outdir/lib/regex/libregex.a $outdir/lib/bio/libbio.a $outdir/lib/std/libstd.a $outdir/lib/sys/libsys.a
+build $outdir/lib/json/fmt.o | $outdir/lib/json/fmt.use: mc $srcdir/lib/json/fmt.myr | $outdir/lib/json/types.use $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use
+  mcdir = $outdir/lib/json
+build $outdir/lib/json/parse.o | $outdir/lib/json/parse.use: mc $srcdir/lib/json/parse.myr | $outdir/lib/json/types.use $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use
+  mcdir = $outdir/lib/json
+build $outdir/lib/json/types.o | $outdir/lib/json/types.use: mc $srcdir/lib/json/types.myr | $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use
+  mcdir = $outdir/lib/json
+build $outdir/lib/json/libjson.a: ar $outdir/lib/json/fmt.o $outdir/lib/json/parse.o $outdir/lib/json/types.o
+build $outdir/lib/json/libjson.use: muse $outdir/lib/json/fmt.use $outdir/lib/json/parse.use $outdir/lib/json/types.use $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use
+  museflags = -p json
 build $outdir/lib/testr/testr.o | $outdir/lib/testr/testr.use: mc $srcdir/lib/testr/testr.myr | $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use
   mcdir = $outdir/lib/testr
 build $outdir/lib/testr/libtestr.a: ar $outdir/lib/testr/testr.o
@@ -329,4 +338,4 @@ build $outdir/mbld/syssel.o | $outdir/mbld/syssel.use: mc $srcdir/mbld/syssel.my
 build $outdir/mbld/types.o | $outdir/mbld/types.use: mc $srcdir/mbld/types.myr | $outdir/lib/sys/libsys.use $outdir/lib/std/libstd.use $outdir/lib/bio/libbio.use $outdir/lib/regex/libregex.use
   mcdir = $outdir/mbld
 build $outdir/mbld/mbld: ld $outdir/_myrrt.o $outdir/mbld/config.o $outdir/mbld/build.o $outdir/mbld/util.o $outdir/mbld/install.o $outdir/mbld/subtest.o $outdir/mbld/main.o $outdir/mbld/opts.o $outdir/mbld/test.o $outdir/mbld/clean.o $outdir/mbld/parse.o $outdir/mbld/deps.o $outdir/mbld/syssel.o $outdir/mbld/types.o $outdir/lib/regex/libregex.a $outdir/lib/bio/libbio.a $outdir/lib/std/libstd.a $outdir/lib/sys/libsys.a
-build $srcdir/lib/sys/util+posixy-x64.s $srcdir/lib/sys/syserrno+linux.myr $srcdir/lib/sys/sys+linux-x64.myr $srcdir/lib/sys/setup+posixy.myr $srcdir/lib/sys/systypes.myr $srcdir/lib/sys/syscall+linux-x64.s $srcdir/lib/sys/ifreq+linux.myr $srcdir/lib/std/die.myr $srcdir/lib/std/hassuffix.myr $srcdir/lib/std/rand.myr $srcdir/lib/std/sldup.myr $srcdir/lib/std/getbp+posixy-x64.s $srcdir/lib/std/now.myr $srcdir/lib/std/extremum.myr $srcdir/lib/std/sljoin.myr $srcdir/lib/std/readall.myr $srcdir/lib/std/slurp.myr $srcdir/lib/std/dirname.myr $srcdir/lib/std/option.myr $srcdir/lib/std/errno.myr $srcdir/lib/std/fltparse.myr $srcdir/lib/std/introspect.myr $srcdir/lib/std/strsplit.myr $srcdir/lib/std/syswrap+posixy.myr $srcdir/lib/std/fltbits.myr $srcdir/lib/std/intparse.myr $srcdir/lib/std/optparse.myr $srcdir/lib/std/dir+linux.myr $srcdir/lib/std/slpush.myr $srcdir/lib/std/sleq.myr $srcdir/lib/std/memops.myr $srcdir/lib/std/ipparse.myr $srcdir/lib/std/dialparse+posixy.myr $srcdir/lib/std/iterutil.myr $srcdir/lib/std/execvp.myr $srcdir/lib/std/slput.myr $srcdir/lib/std/spork.myr $srcdir/lib/std/getint.myr $srcdir/lib/std/htab.myr $srcdir/lib/std/alloc.myr $srcdir/lib/std/varargs.myr $srcdir/lib/std/backtrace+x64.myr $srcdir/lib/std/syswrap-ss+linux.myr $srcdir/lib/std/slfill.myr $srcdir/lib/std/bytealloc.myr $srcdir/lib/std/blat.myr $srcdir/lib/std/diriter.myr $srcdir/lib/std/assert.myr $srcdir/lib/std/writeall.myr $srcdir/lib/std/utf.myr $srcdir/lib/std/striter.myr $srcdir/lib/std/hashfuncs.myr $srcdir/lib/std/clear.myr $srcdir/lib/std/wait+posixy.myr $srcdir/lib/std/strjoin.myr $srcdir/lib/std/mk.myr $srcdir/lib/std/mktemp.myr $srcdir/lib/std/chomp.myr $srcdir/lib/std/units.myr $srcdir/lib/std/memops-impl+posixy-x64.s $srcdir/lib/std/fndup.myr $srcdir/lib/std/putint.myr $srcdir/lib/std/types.myr $srcdir/lib/std/mkpath.myr $srcdir/lib/std/listen+posixy.myr $srcdir/lib/std/bigint.myr $srcdir/lib/std/cstrconv.myr $srcdir/lib/std/env+posixy.myr $srcdir/lib/std/fmt.myr $srcdir/lib/std/resolve+posixy.myr $srcdir/lib/std/consts.myr $srcdir/lib/std/strbuf.myr $srcdir/lib/std/pathjoin.myr $srcdir/lib/std/threadhooks.myr $srcdir/lib/std/chartype.myr $srcdir/lib/std/slpop.myr $srcdir/lib/std/sjlj-impl+posixy-x64.s $srcdir/lib/std/result.myr $srcdir/lib/std/strfind.myr $srcdir/lib/std/slcp.myr $srcdir/lib/std/fmtfuncs.myr $srcdir/lib/std/sleep.myr $srcdir/lib/std/hasprefix.myr $srcdir/lib/std/strstrip.myr $srcdir/lib/std/try.myr $srcdir/lib/std/sort.myr $srcdir/lib/std/search.myr $srcdir/lib/std/cmp.myr $srcdir/lib/std/endian.myr $srcdir/lib/std/getcwd.myr $srcdir/lib/std/swap.myr $srcdir/lib/std/bitset.myr $srcdir/lib/std/sjlj.myr $srcdir/lib/std/dial+posixy.myr $srcdir/lib/std/fltfmt.myr $srcdir/lib/fileutil/homedir.myr $srcdir/lib/fileutil/walk.myr $srcdir/lib/regex/interp.myr $srcdir/lib/regex/ranges.myr $srcdir/lib/regex/compile.myr $srcdir/lib/regex/types.myr $srcdir/lib/bio/puti.myr $srcdir/lib/bio/bio.myr $srcdir/lib/bio/iter.myr $srcdir/lib/bio/geti.myr $srcdir/lib/regex/redump.myr $srcdir/lib/inifile/access.myr $srcdir/lib/inifile/write.myr $srcdir/lib/inifile/parse.myr $srcdir/lib/inifile/types.myr $srcdir/lib/escfmt/escsh.myr $srcdir/lib/escfmt/eschtml.myr $srcdir/lib/escfmt/escurl.myr $srcdir/lib/escfmt/escre.myr $srcdir/support/dumpleak.myr $srcdir/lib/testr/testr.myr $srcdir/lib/thread/mutex+linux.myr $srcdir/lib/thread/spawn+linux.myr $srcdir/lib/thread/hookstd.myr $srcdir/lib/thread/atomic-impl+x64.s $srcdir/lib/thread/atomic.myr $srcdir/lib/thread/common.myr $srcdir/lib/thread/exit+linux-x64.s $srcdir/lib/crypto/sha1.myr $srcdir/lib/crypto/rand.myr $srcdir/lib/crypto/chacha20.myr $srcdir/lib/crypto/sha512.myr $srcdir/lib/crypto/sha3.myr $srcdir/lib/crypto/entropy.myr $srcdir/lib/crypto/sha256.myr $srcdir/lib/crypto/aes.myr $srcdir/lib/crypto/md5.myr $srcdir/lib/date/zoneinfo+posixy.myr $srcdir/lib/date/fmt.myr $srcdir/lib/date/names.myr $srcdir/lib/date/parse.myr $srcdir/lib/date/date.myr $srcdir/lib/date/types.myr $srcdir/mbld/build.myr $srcdir/mbld/util.myr $srcdir/mbld/install.myr $srcdir/mbld/subtest.myr $srcdir/mbld/main.myr $srcdir/mbld/opts.myr $srcdir/mbld/test.myr $srcdir/mbld/clean.myr $srcdir/mbld/parse.myr $srcdir/mbld/deps.myr $srcdir/mbld/syssel.myr $srcdir/mbld/types.myr: phony $outdir/fetch.stamp
+build $srcdir/lib/sys/util+posixy-x64.s $srcdir/lib/sys/syserrno+linux.myr $srcdir/lib/sys/sys+linux-x64.myr $srcdir/lib/sys/setup+posixy.myr $srcdir/lib/sys/systypes.myr $srcdir/lib/sys/syscall+linux-x64.s $srcdir/lib/sys/ifreq+linux.myr $srcdir/lib/std/die.myr $srcdir/lib/std/hassuffix.myr $srcdir/lib/std/rand.myr $srcdir/lib/std/sldup.myr $srcdir/lib/std/getbp+posixy-x64.s $srcdir/lib/std/now.myr $srcdir/lib/std/extremum.myr $srcdir/lib/std/sljoin.myr $srcdir/lib/std/readall.myr $srcdir/lib/std/slurp.myr $srcdir/lib/std/dirname.myr $srcdir/lib/std/option.myr $srcdir/lib/std/errno.myr $srcdir/lib/std/fltparse.myr $srcdir/lib/std/introspect.myr $srcdir/lib/std/strsplit.myr $srcdir/lib/std/syswrap+posixy.myr $srcdir/lib/std/fltbits.myr $srcdir/lib/std/intparse.myr $srcdir/lib/std/optparse.myr $srcdir/lib/std/dir+linux.myr $srcdir/lib/std/slpush.myr $srcdir/lib/std/sleq.myr $srcdir/lib/std/memops.myr $srcdir/lib/std/ipparse.myr $srcdir/lib/std/dialparse+posixy.myr $srcdir/lib/std/iterutil.myr $srcdir/lib/std/execvp.myr $srcdir/lib/std/slput.myr $srcdir/lib/std/spork.myr $srcdir/lib/std/getint.myr $srcdir/lib/std/htab.myr $srcdir/lib/std/alloc.myr $srcdir/lib/std/varargs.myr $srcdir/lib/std/backtrace+x64.myr $srcdir/lib/std/syswrap-ss+linux.myr $srcdir/lib/std/slfill.myr $srcdir/lib/std/bytealloc.myr $srcdir/lib/std/blat.myr $srcdir/lib/std/diriter.myr $srcdir/lib/std/assert.myr $srcdir/lib/std/writeall.myr $srcdir/lib/std/utf.myr $srcdir/lib/std/striter.myr $srcdir/lib/std/hashfuncs.myr $srcdir/lib/std/clear.myr $srcdir/lib/std/wait+posixy.myr $srcdir/lib/std/strjoin.myr $srcdir/lib/std/mk.myr $srcdir/lib/std/mktemp.myr $srcdir/lib/std/chomp.myr $srcdir/lib/std/units.myr $srcdir/lib/std/memops-impl+posixy-x64.s $srcdir/lib/std/fndup.myr $srcdir/lib/std/putint.myr $srcdir/lib/std/types.myr $srcdir/lib/std/mkpath.myr $srcdir/lib/std/listen+posixy.myr $srcdir/lib/std/bigint.myr $srcdir/lib/std/cstrconv.myr $srcdir/lib/std/env+posixy.myr $srcdir/lib/std/fmt.myr $srcdir/lib/std/resolve+posixy.myr $srcdir/lib/std/consts.myr $srcdir/lib/std/strbuf.myr $srcdir/lib/std/pathjoin.myr $srcdir/lib/std/threadhooks.myr $srcdir/lib/std/chartype.myr $srcdir/lib/std/slpop.myr $srcdir/lib/std/sjlj-impl+posixy-x64.s $srcdir/lib/std/result.myr $srcdir/lib/std/strfind.myr $srcdir/lib/std/slcp.myr $srcdir/lib/std/fmtfuncs.myr $srcdir/lib/std/sleep.myr $srcdir/lib/std/hasprefix.myr $srcdir/lib/std/strstrip.myr $srcdir/lib/std/try.myr $srcdir/lib/std/sort.myr $srcdir/lib/std/search.myr $srcdir/lib/std/cmp.myr $srcdir/lib/std/endian.myr $srcdir/lib/std/getcwd.myr $srcdir/lib/std/swap.myr $srcdir/lib/std/bitset.myr $srcdir/lib/std/sjlj.myr $srcdir/lib/std/dial+posixy.myr $srcdir/lib/std/fltfmt.myr $srcdir/lib/fileutil/homedir.myr $srcdir/lib/fileutil/walk.myr $srcdir/lib/regex/interp.myr $srcdir/lib/regex/ranges.myr $srcdir/lib/regex/compile.myr $srcdir/lib/regex/types.myr $srcdir/lib/bio/puti.myr $srcdir/lib/bio/bio.myr $srcdir/lib/bio/iter.myr $srcdir/lib/bio/geti.myr $srcdir/lib/regex/redump.myr $srcdir/lib/inifile/access.myr $srcdir/lib/inifile/write.myr $srcdir/lib/inifile/parse.myr $srcdir/lib/inifile/types.myr $srcdir/lib/escfmt/escsh.myr $srcdir/lib/escfmt/eschtml.myr $srcdir/lib/escfmt/escurl.myr $srcdir/lib/escfmt/escre.myr $srcdir/support/dumpleak.myr $srcdir/lib/json/fmt.myr $srcdir/lib/json/parse.myr $srcdir/lib/json/types.myr $srcdir/lib/testr/testr.myr $srcdir/lib/thread/mutex+linux.myr $srcdir/lib/thread/spawn+linux.myr $srcdir/lib/thread/hookstd.myr $srcdir/lib/thread/atomic-impl+x64.s $srcdir/lib/thread/atomic.myr $srcdir/lib/thread/common.myr $srcdir/lib/thread/exit+linux-x64.s $srcdir/lib/crypto/sha1.myr $srcdir/lib/crypto/rand.myr $srcdir/lib/crypto/chacha20.myr $srcdir/lib/crypto/sha512.myr $srcdir/lib/crypto/sha3.myr $srcdir/lib/crypto/entropy.myr $srcdir/lib/crypto/sha256.myr $srcdir/lib/crypto/aes.myr $srcdir/lib/crypto/md5.myr $srcdir/lib/date/zoneinfo+posixy.myr $srcdir/lib/date/fmt.myr $srcdir/lib/date/names.myr $srcdir/lib/date/parse.myr $srcdir/lib/date/date.myr $srcdir/lib/date/types.myr $srcdir/mbld/build.myr $srcdir/mbld/util.myr $srcdir/mbld/install.myr $srcdir/mbld/subtest.myr $srcdir/mbld/main.myr $srcdir/mbld/opts.myr $srcdir/mbld/test.myr $srcdir/mbld/clean.myr $srcdir/mbld/parse.myr $srcdir/mbld/deps.myr $srcdir/mbld/syssel.myr $srcdir/mbld/types.myr: phony $outdir/fetch.stamp
diff --git a/pkg/mc/config.myr b/pkg/mc/config.myr
index 175be576..a3bf6a69 100644
--- a/pkg/mc/config.myr
+++ b/pkg/mc/config.myr
@@ -1,13 +1,13 @@
 pkg config =
 	const Sys = "Linux"
 	const Linkcmd = ["ld", "-o"]
+	const Manpath = "share/man/man"
 	const Instroot = "/"
 	const Objsuffix = ".o"
 	const Arcmd = ["ar", "-rcs"]
 	const Ascmd = ["as", "-g"]
 	const Directlib = false
 	const Runtime = "_myrrt.o"
-	const Manpath = "share/man/man"
 	const Sharepath = "share"
 	const Binpath = "bin"
 	const Libpath = "lib/myr"
diff --git a/pkg/mc/gen.rc b/pkg/mc/gen.rc
index f34b9056..42ac2dfa 100644
--- a/pkg/mc/gen.rc
+++ b/pkg/mc/gen.rc
@@ -59,7 +59,7 @@ mcflags=('$mcflags' \
 ) set mcflags $"mcflags
 
 include '$dir'/bld.ninja
-for(lib in bio crypto date escfmt fileutil inifile regex std sys testr thread) {
+for(lib in bio crypto date escfmt fileutil inifile json regex std sys testr thread) {
 	file lib/myr/lib$lib.use '$outdir'/lib/$lib/lib$lib.use 644
 	file lib/myr/lib$lib.a '$outdir'/lib/$lib/lib$lib.a 644
 }
diff --git a/pkg/mc/rev b/pkg/mc/rev
index b8626c4c..7ed6ff82 100644
--- a/pkg/mc/rev
+++ b/pkg/mc/rev
@@ -1 +1 @@
-4
+5
diff --git a/pkg/mc/src b/pkg/mc/src
-Subproject 714a85cedc8eea6c4c4d95c074160e0a2ca9e47
+Subproject 658dd280c40c5a6edb110e1170013e8479fe2bd