Browse Source

Bring some things back (which I had hoped to remove forever)

Now, this all boots, but something in cpurc gets a fault, not sure what.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 3 years ago
parent
commit
34968bd768

+ 1 - 0
build.json

@@ -7,6 +7,7 @@
 	},
 	"kregress": {
 		"Projects": [
+			"clean.json",
 			"/sys/src/klibs.json",
 			"/sys/src/libs.json",
 			"/sys/src/cmd",

+ 2 - 2
sys/src/cmd/cmd.json

@@ -16,13 +16,13 @@
 			"-lhttpd",
 			"-lbin",
 			"-llex",
+			"-lmach",
 			"-lmemdraw",
 			"-lmemlayer",
 			"-lmemdraw",
 			"-ldraw",
 			"-lplumb",
 			"-lregexp",
-			"-lstdio",
 			"-lString",
 			"-loventi",
 			"-l9p",
@@ -32,10 +32,10 @@
 			"-lip",
 			"-lventi",
 			"-lsec",
+			"-lstdio",
 			"-lauth",
 			"-lmp",
 			"-lthread",
-			"-lmach",
 			"-lbio",
 			"-lc"
 		],

+ 4 - 0
sys/src/lib9p/lib9p.json

@@ -1,5 +1,9 @@
 {
 	"lib9p": {
+		"Cflags": [
+			"-fplan9-extensions",
+			"-Werror"
+		],
 		"Include": [
 			"../lib.json"
 		],

+ 4 - 0
sys/src/libString/libString.json

@@ -1,5 +1,9 @@
 {
 	"libString": {
+		"Cflags": [
+			"-fplan9-extensions",
+			"-Werror"
+		],
 		"Include": [
 			"../lib.json"
 		],

+ 1 - 0
sys/src/libmach/libmach.json

@@ -1,6 +1,7 @@
 {
 	"libmach": {
 		"Cflags": [
+			"-fplan9-extensions",
 			"-I", "/",
 			"-Werror"
 		],

+ 4 - 6
sys/src/libs.json

@@ -1,12 +1,7 @@
 {
 	"libs.json": {
-		"WhoCares": [
-			"/sys/src/libmach/libmach.json",
-			"/sys/src/libString/libString.json",
-			"/sys/src/libstdio/libstdio.json",
-			"/sys/src/lib9p/lib9p.json"
-		],
 		"Projects": [
+			"/sys/src/lib9p/lib9p.json",
 			"/sys/src/libc/libc.json",
 			"/sys/src/libip/libip.json",
 			"/sys/src/libdraw/libdraw.json",
@@ -23,6 +18,7 @@
 			"/sys/src/libgeometry/libgeometry.json",
 			"/sys/src/libhttpd/libhttpd.json",
 			"/sys/src/liblex/liblex.json",
+			"/sys/src/libmach/libmach.json",
 			"/sys/src/libmemdraw/libmemdraw.json",
 			"/sys/src/libmemlayer/libmemlayer.json",
 			"/sys/src/libmp/libmp.json",
@@ -30,7 +26,9 @@
 			"/sys/src/liboventi/liboventi.json",
 			"/sys/src/libplumb/libplumb.json",
 			"/sys/src/libregexp/libregexp.json",
+			"/sys/src/libString/libString.json",
 			"/sys/src/libsec/libsec.json",
+			"/sys/src/libstdio/libstdio.json",
 			"/sys/src/libthread/libthread.json",
 			"/sys/src/libusb",
 			"/sys/src/libventi/libventi.json"