diff options
| -rw-r--r-- | mbld/build.myr | 6 | ||||
| -rw-r--r-- | mbld/test.myr | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mbld/build.myr b/mbld/build.myr index 10d40f2..5b1afe1 100644 --- a/mbld/build.myr +++ b/mbld/build.myr @@ -183,7 +183,7 @@ const genfiles = {b, gt const addincludes = {b, targ for (inc, lib, subtarg) in targ.libdeps if !hasinc(targ.incpath, inc) - targ.incpath = std.slput(targ.incpath, 0, inc) + std.slput(&targ.incpath, 0, inc) ;; ;; } @@ -419,7 +419,7 @@ const putlib = {cmd, head, lib, incs var sep if !config.Directlib - -> std.slput(cmd, head, std.fmt("-l{}", lib)) + -> std.slput(&cmd, head, std.fmt("-l{}", lib)) else match findlib(lib, incs) | `std.None: @@ -431,7 +431,7 @@ const putlib = {cmd, head, lib, incs ;; std.fatal("could not find library lib{}.a.\n", lib) | `std.Some p: - -> std.slput(cmd, head, p) + -> std.slput(&cmd, head, p) ;; ;; } diff --git a/mbld/test.myr b/mbld/test.myr index e948338..0367f7b 100644 --- a/mbld/test.myr +++ b/mbld/test.myr @@ -37,7 +37,7 @@ const test = {b continue ;; if t.incpath.len == 0 || !std.sleq(t.incpath[0], ".") - t.incpath = std.slput(t.incpath, 0, std.sldup(".")) + std.slput(&t.incpath, 0, std.sldup(".")) ;; buildbin(b, t, false) bincmd = std.sldup([std.strcat("./", t.name)][:]) @@ -114,7 +114,7 @@ const freecmd = {cmd } const buildtests = {b, targ - var tt, bin, tests + var tt, bin, tests, incpath var cmd tests = [][:] @@ -124,13 +124,14 @@ const buildtests = {b, targ | `std.None: /* nothing to do */ | `std.Some path: bin = srcswapsuffix(path, "") + incpath = std.sldup(targ.incpath) tt = [ .name = bin, .dir = targ.dir, .inputs = [path][:], .install = false, .libdeps = std.sldup(targ.libdeps), - .incpath = std.slput(std.sldup(targ.incpath), 0, "."), + .incpath = std.slput(&incpath, 0, "."), ] buildbin(b, &tt, true) |