Add empty.sh and fix single_binary_toolchain_rule

fmeum · fmeum · commit fed82d467ff8 · 2025-05-07T18:23:39.000+02:00
diff --git a/tools/build_defs.bzl b/tools/build_defs.bzl
@@ -57,7 +57,7 @@ IS_HOST_WINDOWS = Label("@platforms//os:windows") in [Label(l) for l in HOST_CON
 
 def _single_binary_toolchain_rule_impl(ctx):
     return platform_common.ToolchainInfo(
-        binary = ctx.attr.binary,
+        binary = ctx.file.binary,
     )
 
 _single_binary_toolchain_rule = rule(
diff --git a/tools/launcher/BUILD.tools b/tools/launcher/BUILD.tools
@@ -49,6 +49,7 @@ single_binary_toolchain(
 
 single_binary_toolchain(
     name = "3_no_launcher_toolchain",
+    binary = "empty.sh",
     toolchain_type = ":launcher_toolchain_type",
 )
 
@@ -69,5 +70,6 @@ single_binary_toolchain(
 
 single_binary_toolchain(
     name = "3_no_launcher_maker_toolchain",
+    binary = "empty.sh",
     toolchain_type = ":launcher_maker_toolchain_type",
 )
diff --git a/tools/launcher/empty.sh b/tools/launcher/empty.sh

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ IS_HOST_WINDOWS = Label("@platforms//os:windows") in [Label(l) for l in HOST_CON`
`57`	`57`
`58`	`58`	`def _single_binary_toolchain_rule_impl(ctx):`
`59`	`59`	`return platform_common.ToolchainInfo(`
`60`		`- binary = ctx.attr.binary,`
	`60`	`+ binary = ctx.file.binary,`
`61`	`61`	`)`
`62`	`62`
`63`	`63`	`_single_binary_toolchain_rule = rule(`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ single_binary_toolchain(`
`49`	`49`
`50`	`50`	`single_binary_toolchain(`
`51`	`51`	`name = "3_no_launcher_toolchain",`
	`52`	`+ binary = "empty.sh",`
`52`	`53`	`toolchain_type = ":launcher_toolchain_type",`
`53`	`54`	`)`
`54`	`55`
`@@ -69,5 +70,6 @@ single_binary_toolchain(`
`69`	`70`
`70`	`71`	`single_binary_toolchain(`
`71`	`72`	`name = "3_no_launcher_maker_toolchain",`
	`73`	`+ binary = "empty.sh",`
`72`	`74`	`toolchain_type = ":launcher_maker_toolchain_type",`
`73`	`75`	`)`