Browse Source

sys/src/9/boot: generate targets for all the archs in a for loop

this will mean that in the future if we want we can compile these
targets in parralel

Signed-off-by: Sevki <s@sevki.org>
Sevki 7 years ago
parent
commit
1be509926e
2 changed files with 74 additions and 74 deletions
  1. 70 70
      sys/src/9/boot/BUILD
  2. 4 4
      sys/src/FLAGS

+ 70 - 70
sys/src/9/boot/BUILD

@@ -7,81 +7,81 @@ ARCHS = [
 ]
 
 [mk_sys(
-    name=printf("boot%scpuc", arch),
-    mode=printf("boot%scpu.c", arch),
-    arch=arch,
-    sysconf="//sys/src/sysconf.json",
+	name="boot%scpuc" % arch,
+	mode="boot%scpu.c" % arch,
+	arch=arch,
+	sysconf="//sys/src/sysconf.json",
 ) for arch in ARCHS]
 
 [data_to_c(
-    name=printf("%scpu", arch),
-    bin=printf("bin/boot%scpu", arch),
-    prefix=printf("ramfs_boot%scpu_", arch),
-    deps=[
-        printf(":boot%scpu", arch),
-    ]
+	name="%scpu" % arch,
+	bin="bin/boot%scpu" %arch,
+	prefix= "ramfs_boot%scpu_" % arch,
+	deps=[
+		":boot%scpu" % arch,
+	]
 ) for arch in ARCHS]
 
 cc_library(
-    name="libboot",
-    copts=[
-        "-g",
-        "-Wall",
-        "-Wno-missing-braces",
-        "-Wno-parentheses",
-        "-Wno-unknown-pragmas",
-        "-O0",
-        "-static",
-        "-mno-red-zone",
-        "-ffreestanding",
-        "-fno-builtin",
-        "-mcmodel=small"
-    ],
-    includes=[
-        "//sys/include",
-        "//sys/src/9/boot",
-        printf("//%s/include", env("ARCH")),
-    ],
-    deps=[
-        printf(":boot%scpuc",  env("ARCH")),
-    ],
-    srcs=[
-        "aux.c",
-        "bootauth.c",
-        "boot.c",
-        "bootcache.c",
-        "bootip.c",
-        printf("boot%scpu.c", env("ARCH")),
-        "bootrc.c",
-        "embed.c",
-        "local.c",
-        "paq.c",
-        "sac.c",
-        "settime.c"
-    ]
-) 
+	name="libboot",
+	copts=[
+		"-g",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-O0",
+		"-static",
+		"-mno-red-zone",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-mcmodel=small"
+	],
+	includes=[
+		"//sys/include",
+		"//sys/src/9/boot",
+		fmt("//%s/include", env("ARCH")),
+	],
+	deps=[
+		fmt(":boot%scpuc", env("ARCH")),
+	],
+	srcs=[
+		"aux.c",
+		"bootauth.c",
+		"boot.c",
+		"bootcache.c",
+		"bootip.c",
+	fmt("boot%scpu.c", env("ARCH")),
+		"bootrc.c",
+		"embed.c",
+		"local.c",
+		"paq.c",
+		"sac.c",
+		"settime.c"
+	]
+)
 
 [cc_binary(
-    name=printf("boot%scpu", arch),
-    copts=LIB_COMPILER_FLAGS,
-    includes=[
-        "//sys/include",
-        "//sys/src/9/boot",
-        printf("//%s/include",arch),
-    ],
-    srcs=[
-        "printstub.c",
-        printf("boot%scpu.c", arch), 
-    ],
-    deps=[
-        ":libboot",
-        printf(":boot%scpuc", arch),
-        "//sys/src/libip:libip",
-        "//sys/src/libauth:libauth",
-        "//sys/src/libc:libc"
-    ],
-    linkopts=[
-        "-e_main",
-        "-static"
-    ]
-) for arch in ARCHS]
+	name="boot%scpu" % arch,
+	copts=LIB_COMPILER_FLAGS,
+	includes=[
+		"//sys/include",
+		"//sys/src/9/boot",
+		"//%s/include" % arch,
+	],
+	srcs=[
+		"printstub.c",
+		"boot%scpu.c" % arch,
+	],
+	deps=[
+		":libboot",
+		":boot%scpuc" % arch,
+		"//sys/src/libip:libip",
+		"//sys/src/libauth:libauth",
+		"//sys/src/libc:libc"
+	],
+	linkopts=[
+		"-e_main",
+		"-static"
+	]
+) for arch in ARCHS]

+ 4 - 4
sys/src/FLAGS

@@ -1,4 +1,4 @@
-CMD_DEPS = [
+CMD_DEPS=[
     "//sys/src/libavl:libavl",
     "//sys/src/libcomplete:libcomplete",
     "//sys/src/libcontrol:libcontrol",
@@ -32,12 +32,12 @@ CMD_DEPS = [
     "//sys/src/libc:libc",
 ]
 
-CMD_LINK_OPTS = [
+CMD_LINK_OPTS=[
     "-static",
     "-e_main",
 ]
 
-KLIB_COMPILER_FLAGS = [
+KLIB_COMPILER_FLAGS=[
 	"-mcmodel=kernel",
 	"-O0",
 	"-mno-red-zone",
@@ -51,7 +51,7 @@ KLIB_COMPILER_FLAGS = [
 	"-g",
 ]
 
-LIB_COMPILER_FLAGS = [
+LIB_COMPILER_FLAGS=[
     "-std=c11",
     "-fasm",
     "-c",