Просмотр исходного кода

ACPI: fix up BUILD files so kernel almost builds.

There were missing flags, the library names were still wrong, lots of little things.

Still not quite there but close.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 8 лет назад
Родитель
Сommit
5bd9cb8b55

+ 4 - 0
sys/src/9/amd64/BUILD

@@ -353,6 +353,7 @@ cc_binary(
 	name="harvey",
 	copts=[
 		"-c",
+		"-std=c11",
 		"-mcmodel=kernel",
 		"-O0",
 		"-static",
@@ -363,12 +364,15 @@ cc_binary(
 		"-g",
 		"-Wall",
 		"-W",
+		"-Wno-unused-function",
 		"-Wno-sign-compare",
 		"-Wno-missing-field-initializers",
 		"-Wno-unused-parameter",
 		"-Wno-missing-braces",
 		"-Wno-parentheses",
 		"-Wno-unknown-pragmas",
+		"-D__HARVEY__",
+		"-U_LINUX", "-U__linux__",
 		"-fasm",
 	],
 	srcs=AMD64SRCS,

+ 6 - 6
sys/src/BUILD

@@ -1,10 +1,10 @@
 KLIBS=[
-	"//sys/src/libmemlayer:libkmemlayer",
-	"//sys/src/libmemdraw:libkmemdraw",
-	"//sys/src/libdraw:libkdraw",
-	"//sys/src/libc:libkc",
-	"//sys/src/libip:libkip",
-	"//sys/src/libsec:libksec",
+	"//sys/src/libmemlayer:klibmemlayer",
+	"//sys/src/libmemdraw:klibmemdraw",
+	"//sys/src/libdraw:klibdraw",
+	"//sys/src/libc:klibc",
+	"//sys/src/libip:klibip",
+	"//sys/src/libsec:klibsec",
 ]
 group(
     name="klibs",

+ 1 - 1
sys/src/cmd/rc/BUILD

@@ -10,7 +10,7 @@ cc_binary(
     ],
     deps=[
         ":syn",
-        "//sys/src/libip:libkip",
+        "//sys/src/libip:klibip",
         "//sys/src/libbio:libbio",
         "//sys/src/libauth:libauth",
         "//sys/src/libndb:libndb",

+ 1 - 1
sys/src/libc/BUILD

@@ -441,7 +441,7 @@ KLIBC_SRCS = [
 
 
 cc_library(
-    name="libkc",
+    name="klibc",
     copts=KLIB_COMPILER_FLAGS,
     includes=[
         "//sys/include",

+ 1 - 1
sys/src/libdraw/BUILD

@@ -1,7 +1,7 @@
 load('//sys/src/FLAGS', "KLIB_COMPILER_FLAGS", "LIB_COMPILER_FLAGS")
 
 cc_library(
-    name="libkdraw",
+    name="klibdraw",
     copts=KLIB_COMPILER_FLAGS,
     includes=[
         "//sys/include",

+ 1 - 1
sys/src/libip/BUILD

@@ -1,7 +1,7 @@
 load("//sys/src/FLAGS", "KLIB_COMPILER_FLAGS", "LIB_COMPILER_FLAGS")
 
 cc_library(
-    name="libkip",
+    name="klibip",
     copts=KLIB_COMPILER_FLAGS,
     includes=[
         "//sys/include",

+ 1 - 1
sys/src/libmemdraw/BUILD

@@ -1,7 +1,7 @@
 load('//sys/src/FLAGS', "KLIB_COMPILER_FLAGS", "LIB_COMPILER_FLAGS")
 
 cc_library(
-    name="libkmemdraw",
+    name="klibmemdraw",
     copts=KLIB_COMPILER_FLAGS,
     includes=[
         "//sys/include",

+ 1 - 1
sys/src/libmemlayer/BUILD

@@ -1,7 +1,7 @@
 load('//sys/src/FLAGS', "KLIB_COMPILER_FLAGS", "LIB_COMPILER_FLAGS")
 
 cc_library(
-    name="libkmemlayer",
+    name="klibmemlayer",
     copts=KLIB_COMPILER_FLAGS,
     includes=[
         "//sys/include",

+ 1 - 1
sys/src/libsec/BUILD

@@ -1,7 +1,7 @@
 load('//sys/src/FLAGS', "KLIB_COMPILER_FLAGS", "LIB_COMPILER_FLAGS")
 
 cc_library(
-    name="libksec",
+    name="klibsec",
     copts=KLIB_COMPILER_FLAGS,
     includes=[
         "//sys/include",