1 files changed, 48 insertions, 44 deletions
diff --git a/src/bootstrap/stage-0-busybox.TARGETS b/src/bootstrap/stage-0-busybox.TARGETS
index 09fb1bd..a7b9033 100644
--- a/src/bootstrap/stage-0-busybox.TARGETS
+++ b/src/bootstrap/stage-0-busybox.TARGETS
@@ -1,49 +1,53 @@
 { "bootstrap":
   { "type": "install"
-  , "files":
-    { "bin/[": "bootstrap-test"
-    , "bin/awk": "bootstrap-awk"
-    , "bin/basename": "bootstrap-basename"
-    , "bin/bzip2": "bootstrap-bzip2"
-    , "bin/cat": "bootstrap-cat"
-    , "bin/chmod": "bootstrap-chmod"
-    , "bin/cmp": "bootstrap-cmp"
-    , "bin/cp": "bootstrap-cp"
-    , "bin/date": "bootstrap-date"
-    , "bin/diff": "bootstrap-diff"
-    , "bin/dirname": "bootstrap-dirname"
-    , "bin/echo": "bootstrap-echo"
-    , "bin/env": "bootstrap-env"
-    , "bin/expr": "bootstrap-expr"
-    , "bin/false": "bootstrap-false"
-    , "bin/find": "bootstrap-find"
-    , "bin/grep": "bootstrap-grep"
-    , "bin/install": "bootstrap-install"
-    , "bin/ln": "bootstrap-ln"
-    , "bin/ls": "bootstrap-ls"
-    , "bin/mkdir": "bootstrap-mkdir"
-    , "bin/mktemp": "bootstrap-mktemp"
-    , "bin/mv": "bootstrap-mv"
-    , "bin/patch": "bootstrap-patch"
-    , "bin/printf": "bootstrap-printf"
-    , "bin/pwd": "bootstrap-pwd"
-    , "bin/rm": "bootstrap-rm"
-    , "bin/rmdir": "bootstrap-rmdir"
-    , "bin/sed": "bootstrap-sed"
-    , "bin/sh": "bootstrap-ash"
-    , "bin/sleep": "bootstrap-sleep"
-    , "bin/sort": "bootstrap-sort"
-    , "bin/tail": "bootstrap-tail"
-    , "bin/tar": "bootstrap-tar"
-    , "bin/test": "bootstrap-test"
-    , "bin/touch": "bootstrap-touch"
-    , "bin/tr": "bootstrap-tr"
-    , "bin/true": "bootstrap-true"
-    , "bin/od": "bootstrap-od"
-    , "bin/uname": "bootstrap-uname"
-    , "bin/uniq": "bootstrap-uniq"
-    , "bin/wc": "bootstrap-wc"
-    }
+  , "files": {"bin/[": "bootstrap-test", "bin/sh": "bootstrap-ash"}
+  , "dirs": [["bootstrap (tools)", "."]]
+  }
+, "bootstrap (tools)":
+  { "type": ["@", "rules", "CC", "install-with-deps"]
+  , "targets":
+    [ "bootstrap-awk"
+    , "bootstrap-basename"
+    , "bootstrap-bzip2"
+    , "bootstrap-cat"
+    , "bootstrap-chmod"
+    , "bootstrap-cmp"
+    , "bootstrap-cp"
+    , "bootstrap-date"
+    , "bootstrap-diff"
+    , "bootstrap-dirname"
+    , "bootstrap-echo"
+    , "bootstrap-env"
+    , "bootstrap-expr"
+    , "bootstrap-false"
+    , "bootstrap-find"
+    , "bootstrap-grep"
+    , "bootstrap-install"
+    , "bootstrap-ln"
+    , "bootstrap-ls"
+    , "bootstrap-mkdir"
+    , "bootstrap-mktemp"
+    , "bootstrap-mv"
+    , "bootstrap-patch"
+    , "bootstrap-printf"
+    , "bootstrap-pwd"
+    , "bootstrap-rm"
+    , "bootstrap-rmdir"
+    , "bootstrap-sed"
+    , "bootstrap-ash"
+    , "bootstrap-sleep"
+    , "bootstrap-sort"
+    , "bootstrap-tail"
+    , "bootstrap-tar"
+    , "bootstrap-test"
+    , "bootstrap-touch"
+    , "bootstrap-tr"
+    , "bootstrap-true"
+    , "bootstrap-od"
+    , "bootstrap-uname"
+    , "bootstrap-uniq"
+    , "bootstrap-wc"
+    ]
   }
 , "toolchain":
   { "type": "export"