summaryrefslogtreecommitdiff
path: root/mbld
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2016-02-04 21:14:50 -0800
committerOri Bernstein <ori@eigenstate.org>2016-02-04 21:14:50 -0800
commit9edbd938a58bdcd53f38bc4b8fcdae73177432c4 (patch)
tree9db0236d4b1b903865a6e09ff7209408f193213b /mbld
parent49d55e7425056ea5704fffe9f19f76c659079348 (diff)
downloadmc-9edbd938a58bdcd53f38bc4b8fcdae73177432c4.tar.gz
Make std.sljoin consistent.
Diffstat (limited to 'mbld')
-rw-r--r--mbld/deps.myr4
-rw-r--r--mbld/main.myr5
-rw-r--r--mbld/test.myr4
3 files changed, 8 insertions, 5 deletions
diff --git a/mbld/deps.myr b/mbld/deps.myr
index 48211ee..5aea6db 100644
--- a/mbld/deps.myr
+++ b/mbld/deps.myr
@@ -87,7 +87,7 @@ const myrdeps = {b, mt, doclean, addsrc
elif std.hassuffix(srcs[i], ".glue.c")
(cflags, libs) = scrapecflags(b, dg, srcs[i])
std.htput(dg.cflags, srcs[i], cflags)
- dg.extlibs = std.sljoin(dg.extlibs, libs)
+ std.sljoin(&dg.extlibs, libs)
dg.dynamic = true
;;
;;
@@ -162,7 +162,7 @@ const srcdeps = {b, ds, g, path, obj, usefile
;;
| `Local (l, lnum):
if !std.hassuffix(l, ".use")
- l = std.sljoin(l, ".use")
+ std.sljoin(&l, ".use")
;;
if obj.len != 0
pushdep(g, l, obj)
diff --git a/mbld/main.myr b/mbld/main.myr
index 097f4f7..f009c25 100644
--- a/mbld/main.myr
+++ b/mbld/main.myr
@@ -153,7 +153,10 @@ const buildimm = {b, targ, inputs, bintarg, cleanfirst -> bool
}
const runcmd = {bin, args
- -> bld.run(std.sljoin(std.sldup([bin][:]), args))
+ var sl
+
+ sl = std.sldup([bin][:])
+ -> bld.run(std.sljoin(&sl, args))
}
const mkbuild = {tags
diff --git a/mbld/test.myr b/mbld/test.myr
index d4ce0d9..e948338 100644
--- a/mbld/test.myr
+++ b/mbld/test.myr
@@ -25,8 +25,8 @@ const test = {b
setdir(b, "")
for tn in b.all
match gettarg(b.targs, tn)
- | `Bin bt: tests = std.sljoin(tests, buildtests(b, bt))
- | `Lib lt: tests = std.sljoin(tests, buildtests(b, lt))
+ | `Bin bt: std.sljoin(&tests, buildtests(b, bt))
+ | `Lib lt: std.sljoin(&tests, buildtests(b, lt))
| _: /* nothing */
;;
;;