ref: 4133ae84edc4becab38dee52de3f8e4b0d75ca45
parent: d9e2c6c7cf64dab43e65c2f4ec2c13c301297f48
author: Ori Bernstein <[email protected]>
date: Mon Sep 22 18:46:24 EDT 2014
Add support for 'lib' target.
--- a/build.myr
+++ b/build.myr
@@ -33,21 +33,25 @@
-> true
}
-const buildbin = {dg, b, inputs- match std.htget(dg.deps, b)
+const buildbin = {dg, bin, inputs+ match std.htget(dg.deps, bin)
| `std.Some deps:
for d in deps
- builddep(dg, d, b)
+ builddep(dg, d, bin)
;;
- linkbin(dg, b, inputs, "")
+ linkbin(dg, bin, inputs, "")
| `std.None:
;;
}
-const buildlib = {dt, b, dep- std.put("building %s:\n", b)- for d in dep
- std.put("\t%s\n", d)+const buildlib = {dg, lib, inputs+ match std.htget(dg.deps, lib)
+ | `std.Some deps:
+ for d in deps
+ builddep(dg, d, lib)
+ ;;
+ archivelib(dg, lib, inputs)
+ | `std.None:
;;
}
@@ -74,7 +78,7 @@
;;
}
-const linkbin = {dg, binname, srcfiles, ldscript+const linkbin = {dg, bin, srcfiles, ldscriptvar cmd
var obj
@@ -83,7 +87,7 @@
/* ld -o bin */
cmd = std.slpush(cmd, std.sldup("ld")) cmd = std.slpush(cmd, std.sldup("-o"))- cmd = std.slpush(cmd, std.sldup(binname))
+ cmd = std.slpush(cmd, std.sldup(bin))
/* [-T script] */
if ldscript.len > 0
@@ -125,6 +129,29 @@
run(cmd)
strlistfree(cmd)
}
+
+const archivelib = {dg, lib, files+ var cmd
+ var obj
+
+ cmd = [][:]
+ cmd = std.slpush(cmd, std.sldup("ar"))+ cmd = std.slpush(cmd, std.sldup("-rcs"))+ cmd = std.slpush(cmd, std.fmt("lib%s.a", lib))+ for f in files
+ if std.hassuffix(f, ".myr")
+ obj = swapsuffix(f, ".myr", ".o")
+ elif std.hassuffix(f, ".s")
+ obj = swapsuffix(f, ".s", ".o")
+ else
+ std.fatal(1, "unknown file type for %s\n", f)
+ ;;
+ cmd = std.slpush(cmd, obj)
+ ;;
+ run(cmd)
+ strlistfree(cmd)
+}
+
const addlibs = {cmd, libgraph