summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-04-17 01:11:30 -0700
committerMichael Forney <mforney@mforney.org>2016-04-17 01:11:30 -0700
commit8164cbf04c031f6ddf2214346d15870af78e8e73 (patch)
tree0a35cba93ab7046440a7ff89bfd925bbbfe67f9e
parent8303872c044b4133b17b67413168e41a3c870943 (diff)
Add support for specifying .o files in static_lib
-rw-r--r--ninja.rc13
1 files changed, 10 insertions, 3 deletions
diff --git a/ninja.rc b/ninja.rc
index c4d34db9..863cd8fd 100644
--- a/ninja.rc
+++ b/ninja.rc
@@ -85,10 +85,17 @@ fn ar {
}
fn static_lib {
- out=$1 {
+ out=$1 objs=() {
shift
- for(src) cc $src
- ar $out $*.o
+ for(src) {
+ if(~ $src *.c) {
+ cc $src
+ obj=$src.o
+ }
+ if not obj=$src
+ objs=($objs $obj)
+ }
+ ar $out $objs
}
}