diff --git a/prelude/go/go_binary.bzl b/prelude/go/go_binary.bzl index e33d445fc98..6d862865136 100644 --- a/prelude/go/go_binary.bzl +++ b/prelude/go/go_binary.bzl @@ -26,7 +26,7 @@ def go_binary_impl(ctx: AnalysisContext) -> list[Provider]: get_filtered_srcs(ctx, ctx.attrs.srcs), deps = ctx.attrs.deps, compile_flags = ctx.attrs.compiler_flags, - race = ctx.attrs.race, + race = ctx.attrs._race, ) (bin, runtime_files, external_debug_info) = link( ctx, @@ -35,7 +35,7 @@ def go_binary_impl(ctx: AnalysisContext) -> list[Provider]: link_style = value_or(map_val(LinkStyle, ctx.attrs.link_style), LinkStyle("static")), linker_flags = ctx.attrs.linker_flags, link_mode = ctx.attrs.link_mode, - race = ctx.attrs.race, + race = ctx.attrs._race, ) # runtime_files are all the artifacts that must be present in order for this diff --git a/prelude/go/go_exported_library.bzl b/prelude/go/go_exported_library.bzl index 3616b4b759a..b069f85f4e0 100644 --- a/prelude/go/go_exported_library.bzl +++ b/prelude/go/go_exported_library.bzl @@ -25,7 +25,7 @@ def go_exported_library_impl(ctx: AnalysisContext) -> list[Provider]: deps = ctx.attrs.deps, compile_flags = ctx.attrs.compiler_flags, shared = True, - race = ctx.attrs.race, + race = ctx.attrs._race, ) (bin, runtime_files, _external_debug_info) = link( ctx, @@ -36,7 +36,7 @@ def go_exported_library_impl(ctx: AnalysisContext) -> list[Provider]: linker_flags = ctx.attrs.linker_flags, external_linker_flags = ctx.attrs.external_linker_flags, shared = True, - race = ctx.attrs.race, + race = ctx.attrs._race, ) return [ DefaultInfo( diff --git a/prelude/go/go_test.bzl b/prelude/go/go_test.bzl index 80bfc675f50..ecfaedd3508 100644 --- a/prelude/go/go_test.bzl +++ b/prelude/go/go_test.bzl @@ -96,14 +96,14 @@ def go_test_impl(ctx: AnalysisContext) -> list[Provider]: pkgs = pkgs, compile_flags = ctx.attrs.compiler_flags, coverage_mode = coverage_mode, - race = ctx.attrs.race, + race = ctx.attrs._race, ) # Generate a main function which runs the tests and build that into another # package. gen_main = _gen_test_main(ctx, pkg_name, coverage_mode, coverage_vars, srcs) pkgs[pkg_name] = tests - main = compile(ctx, "main", cmd_args(gen_main), pkgs = pkgs, coverage_mode = coverage_mode, race = ctx.attrs.race) + main = compile(ctx, "main", cmd_args(gen_main), pkgs = pkgs, coverage_mode = coverage_mode, race = ctx.attrs._race) # Link the above into a Go binary. (bin, runtime_files, external_debug_info) = link( @@ -115,7 +115,7 @@ def go_test_impl(ctx: AnalysisContext) -> list[Provider]: linker_flags = ctx.attrs.linker_flags, shared = False, coverage_mode = coverage_mode, - race = ctx.attrs.race, + race = ctx.attrs._race, ) run_cmd = cmd_args(bin).hidden(runtime_files, external_debug_info) diff --git a/prelude/rules_impl.bzl b/prelude/rules_impl.bzl index 2a2360e0698..2a45152aaed 100644 --- a/prelude/rules_impl.bzl +++ b/prelude/rules_impl.bzl @@ -432,12 +432,14 @@ inlined_extra_attributes = { "_exec_os_type": buck.exec_os_type_arg(), "_go_stdlib": attrs.default_only(attrs.dep(default = "prelude//go/tools:stdlib")), "_go_toolchain": toolchains_common.go(), + "_race": race_attr, }, "go_exported_library": { "embedcfg": attrs.option(attrs.source(allow_directory = False), default = None), "_exec_os_type": buck.exec_os_type_arg(), "_go_stdlib": attrs.default_only(attrs.dep(default = "prelude//go/tools:stdlib")), "_go_toolchain": toolchains_common.go(), + "_race": race_attr, }, "go_library": { "embedcfg": attrs.option(attrs.source(allow_directory = False), default = None), @@ -461,6 +463,7 @@ inlined_extra_attributes = { "_exec_os_type": buck.exec_os_type_arg(), "_go_stdlib": attrs.default_only(attrs.dep(default = "prelude//go/tools:stdlib")), "_go_toolchain": toolchains_common.go(), + "_race": race_attr, "_testmaingen": attrs.default_only(attrs.exec_dep(default = "prelude//go/tools:testmaingen")), },