Browse Source

Move $ARCH/include/*.json -> $ARCH/

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 1 year ago
parent
commit
8806ed1122

aarch64/include/cflags.json → aarch64/cflags.json


aarch64/include/klib.json → aarch64/klib.json


+ 1 - 1
amd64/include/cflags.json

@@ -22,7 +22,7 @@
 			"max-page-size=0x200000"
 		],
 		"Include": [
-			"/$ARCH/include/$CC.json"
+			"/$ARCH/$CC.json"
 		]
 	}
 }

amd64/include/clang-3.4.json → amd64/clang-3.4.json


amd64/include/clang-3.5.json → amd64/clang-3.5.json


amd64/include/clang-3.6.json → amd64/clang-3.6.json


amd64/include/clang-3.7.json → amd64/clang-3.7.json


amd64/include/clang-3.8.json → amd64/clang-3.8.json


amd64/include/clang-3.9.json → amd64/clang-3.9.json


amd64/include/clang-4.0.json → amd64/clang-4.0.json


amd64/include/clang-6.0.json → amd64/clang-6.0.json


amd64/include/clang.json → amd64/clang.json


amd64/include/gcc-4.8.json → amd64/gcc-4.8.json


amd64/include/gcc-5.json → amd64/gcc-5.json


amd64/include/gcc-6.json → amd64/gcc-6.json


amd64/include/gcc-7.json → amd64/gcc-7.json


amd64/include/gcc-8.json → amd64/gcc-8.json


amd64/include/gcc.json → amd64/gcc.json


amd64/include/icc.json → amd64/icc.json


+ 1 - 1
amd64/include/klib.json

@@ -12,7 +12,7 @@
 			"-g"
 		],
 		"Include": [
-			"/$ARCH/include/$CC.json"
+			"/$ARCH/$CC.json"
 		],
 		"Oflags": [
 			"-static"

amd64/include/x86_64-elf-gcc.json → amd64/x86_64-elf-gcc.json


amd64/include/x86_64-none-elf-gcc.json → amd64/x86_64-none-elf-gcc.json


+ 1 - 1
riscv/include/cflags.json

@@ -15,7 +15,7 @@
 		],
 		"Oflags": [
 			"-T",
-			"/$ARCH/include/prog.ld",
+			"/$ARCH/prog.ld",
 			"--no-relax"
 		]
 	}

riscv/include/klib.json → riscv/klib.json


riscv/include/prog.ld → riscv/prog.ld


+ 1 - 1
sys/src/9/amd64/core.json

@@ -23,7 +23,7 @@
 			"/sys/src/libc/9syscall"
 		],
 		"Include": [
-			"/$ARCH/include/$CC.json"
+			"/$ARCH/$CC.json"
 		],
 		"Libs": [
 			"/$ARCH/lib/klibmemlayer.a",

+ 1 - 1
sys/src/9/boot/bootconf.json

@@ -1,7 +1,7 @@
 {
 	"bootcpu": {
 		"Include": [
-			"/$ARCH/include/cflags.json"
+			"/$ARCH/cflags.json"
 		],
 		"Libs": [
 			"libboot.a",

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

@@ -1,7 +1,7 @@
 {
 	"Cmd": {
 		"Include": [
-			"/$ARCH/include/cflags.json"
+			"/$ARCH/cflags.json"
 		],
 		"Oflags": [
 			"-static",

+ 1 - 1
sys/src/lib.json

@@ -1,7 +1,7 @@
 {
 	"Libs": {
 		"Include": [
-			"/$ARCH/include/cflags.json"
+			"/$ARCH/cflags.json"
 		],
 		"Oflags": [
 			"-static"

+ 1 - 1
sys/src/libc/klibc.json

@@ -4,7 +4,7 @@
 			"-fasm"
 		],
 		"Include": [
-			"/$ARCH/include/klib.json",
+			"/$ARCH/klib.json",
 			"$ARCH/build.json"
 		],
 		"Install": "/$ARCH/lib/",

+ 1 - 1
sys/src/libdraw/klibdraw.json

@@ -1,7 +1,7 @@
 {
 	"KernelLibdraw": {
 		"Include": [
-			"/$ARCH/include/klib.json"
+			"/$ARCH/klib.json"
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "klibdraw.a",

+ 1 - 1
sys/src/libip/klibip.json

@@ -1,7 +1,7 @@
 {
 	"KernelLibip": {
 		"Include": [
-			"/$ARCH/include/klib.json"
+			"/$ARCH/klib.json"
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "klibip.a",

+ 1 - 1
sys/src/libmemdraw/klibmemdraw.json

@@ -1,7 +1,7 @@
 {
 	"KernelLibmemdraw": {
 		"Include": [
-			"/$ARCH/include/klib.json"
+			"/$ARCH/klib.json"
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "klibmemdraw.a",

+ 1 - 1
sys/src/libmemlayer/klibmemlayer.json

@@ -1,7 +1,7 @@
 {
 	"KernelLibmemlayer": {
 		"Include": [
-			"/$ARCH/include/klib.json"
+			"/$ARCH/klib.json"
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "klibmemlayer.a",

+ 1 - 1
sys/src/libsec/klibsec.json

@@ -1,7 +1,7 @@
 {
 	"Kernellibsec": {
 		"Include": [
-			"/$ARCH/include/klib.json"
+			"/$ARCH/klib.json"
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "klibsec.a",

+ 1 - 1
sys/src/libthread/libthread.json

@@ -1,7 +1,7 @@
 {
 	"libthread": {
 		"Include": [
-			"/$ARCH/include/cflags.json",
+			"/$ARCH/cflags.json",
 			"../lib.json"
 		],
 		"Install": "/$ARCH/lib/",

+ 1 - 1
sys/src/libufs/klibufs.json

@@ -1,7 +1,7 @@
 {
 	"Kernellibufs": {
 		"Include": [
-			"/$ARCH/include/klib.json"
+			"/$ARCH/klib.json"
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "klibufs.a",