Browse Source

bldy: fix amd64 fixes for harvey

Signed-off-by: Sevki <s@sevki.org>
Sevki 2 years ago
parent
commit
04d9c3ab62
2 changed files with 12 additions and 12 deletions
  1. 1 1
      BUILD
  2. 11 11
      sys/src/9/amd64/BUILD

+ 1 - 1
BUILD

@@ -10,7 +10,7 @@ ARCH = env("ARCH")
 group(
 	name="kernel",
 	deps=[
-		"//sys/src/9/%s:9bins" %  ARCH,
+		"//sys/src/9/%s:kernelbins" %  ARCH,
 		":libsncmds",
 	],
 )

+ 11 - 11
sys/src/9/amd64/BUILD

@@ -216,7 +216,7 @@ mk_sys(
 	sysconf="//sys/src/sysconf.json",
 )
 group(
-	name="9bins",
+	name="kernelbins",
 	prefix="sys/src/9/amd64",
 	deps=[
 		":harvey.32bit",
@@ -224,7 +224,16 @@ group(
 	],
 )
 
-HRVYDEPS = [
+objcopy(
+	name="harvey.32bit",
+	deps=[
+		"//sys/src/9/amd64:harvey"
+	],
+	infile="elf64-x86-64",
+	outfile="elf32-i386",
+)
+
+HRVYDEPS =[
 	":amd64cpu",
 	":error",
 	":errstr",
@@ -279,15 +288,6 @@ cc_binary(
 	]
 )
 
-objcopy(
-	name="harvey.32bit",
-	deps=[
-		"//sys/src/9/amd64:harvey"
-	],
-	infile="elf64-x86-64",
-	outfile="elf32-i386",
-)
-
 KERNEL_DEPS = [
 	"//sys/src/cmd:bind",
 	":boot",