Biggish refactor to break cycles; my build rules were full of them. cpm builds,

which requires top and topgen.

plat/pc86/build-headers.lua

@@ -0,0 +1,10 @@
+include("plat/build.lua")
+
+acklibrary {
+	name = "headers",
+	hdrs = {
+		["ack/config.h"] = "./include/ack/config.h",
+		["unistd.h"] = "./include/unistd.h",
+	}
+}
+

plat/pc86/build-pkg.lua

@@ -1,11 +1,4 @@
 include("plat/build.lua")
-include("lang/build.lua")
-
-build_plat_tools {
-	name = "tools",
-	arch = "i86",
-	plat = "pc86",
-}
 
 ackfile {
 	name = "boot",
@@ -13,14 +6,6 @@ ackfile {
 	vars = { plat = "pc86" }
 }
 
-acklibrary {
-	name = "headers",
-	hdrs = {
-		["ack/config.h"] = "./include/ack/config.h",
-		["unistd.h"] = "./include/unistd.h",
-	}
-}
-
 build_plat_libs {
 	name = "libs",
 	arch = "i86",

plat/pc86/build-tools.lua

@@ -0,0 +1,21 @@
+include("plat/build.lua")
+
+build_as {
+	name = "as",
+	arch = "i86",
+}
+
+build_ncg {
+	name = "ncg",
+	arch = "i86",
+}
+
+return installable {
+	name = "tools",
+	map = {
+		["$(PLATDEP)/pc86/as"] = "+as",
+		["$(PLATDEP)/pc86/ncg"] = "+ncg",
+		["$(PLATIND)/descr/pc86"] = "./descr",
+		"util/opt+pkg",
+	}
+}