summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-03 10:44:24 -0700
committerMichael Forney <mforney@mforney.org>2016-07-03 10:44:24 -0700
commit257e042bf28382e6f5dc3e2acf929a3fe01e1201 (patch)
treeea18427bb18adee46525932083f71ec62311db92 /core
parent52b76cb615034dc8db23f3f76edcef8a150dd510 (diff)
Add sub helper function
Diffstat (limited to 'core')
-rw-r--r--core/awk/gen.rc3
-rw-r--r--core/e2fsprogs/gen.rc3
-rw-r--r--core/perp/gen.rc3
3 files changed, 3 insertions, 6 deletions
diff --git a/core/awk/gen.rc b/core/awk/gen.rc
index 1ca128d2..750be952 100644
--- a/core/awk/gen.rc
+++ b/core/awk/gen.rc
@@ -7,8 +7,7 @@ build '$outdir'/ytab.h copy '$outdir'/gram.tab.h
include 'toolchain/$host_toolchain.ninja'
cflags -I '$outdir'
exe maketab -d '$outdir'/ytab.h maketab.c
-} >tools.ninja
-subninja '$dir/tools.ninja'
+} | sub tools.ninja
rule maketab '(cd $outdir && ./maketab) >$out.tmp && mv $out.tmp $out'
build '$outdir'/proctab.c maketab '|' '$outdir'/maketab
diff --git a/core/e2fsprogs/gen.rc b/core/e2fsprogs/gen.rc
index ade5cf25..f93e241e 100644
--- a/core/e2fsprogs/gen.rc
+++ b/core/e2fsprogs/gen.rc
@@ -46,8 +46,7 @@ build '$outdir'/internal/blkid/blkid_types.h copy '$dir'/blkid_types.h
{
include 'toolchain/$host_toolchain.ninja'
exe gen_crc32ctable lib/ext2fs/gen_crc32ctable.c
-} >tools.ninja
-subninja '$dir'/tools.ninja
+} | sub tools.ninja
rule gen_crc32ctable '$outdir/gen_crc32ctable >$out.tmp && mv $out.tmp $out'
build '$outdir'/internal/crc32c_table.h gen_crc32ctable '|' '$outdir'/gen_crc32ctable
diff --git a/core/perp/gen.rc b/core/perp/gen.rc
index f1ad847a..8e121428 100644
--- a/core/perp/gen.rc
+++ b/core/perp/gen.rc
@@ -7,8 +7,7 @@ cflags\
exe mk_outvec lasagna/outvec/mk_outvec.c
exe mk_rlimit lasagna/rlimit/mk_rlimit.c
exe mksysstr lasagna/sysstr/mksysstr.c
-} >tools.ninja
-subninja '$dir/tools.ninja'
+} | sub tools.ninja
rule outvec '$outdir/mk_outvec >$out.tmp && mv $out.tmp $out'
build '$outdir'/outvec_STDOUT.h outvec '|' '$outdir'/mk_outvec