Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/toolchains/go/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ local_path_override(

bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "rules_cc", version = "0.1.4")
bazel_dep(name = "rules_go", version = "0.50.1")
bazel_dep(name = "rules_go", version = "0.60.0")

nix_repo = use_extension("@rules_nixpkgs_core//extensions:repository.bzl", "nix_repo")
nix_repo.file(
Expand Down
2 changes: 1 addition & 1 deletion testing/go-bzlmod/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ local_path_override(
path = "../../toolchains/java",
)

bazel_dep(name = "rules_go", version = "0.50.1")
bazel_dep(name = "rules_go", version = "0.60.0")
bazel_dep(name = "rules_cc", version = "0.0.9")

# TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has
Expand Down
5 changes: 3 additions & 2 deletions toolchains/go/go.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ go_toolchain_func = """
load("@{rules_go}//go:def.bzl", "go_toolchain")

PLATFORMS = {PLATFORMS}
def declare_toolchains(host_goos, host_goarch):
def declare_toolchains(host_goos, host_goarch, pack):
for p in PLATFORMS:
link_flags = []
cgo_link_flags = []
Expand All @@ -143,6 +143,7 @@ def declare_toolchains(host_goos, host_goarch):
goarch = p.goarch,
sdk = "@{sdk_repo}//:go_sdk",
builder = "@{sdk_repo}//:builder",
pack = pack,
link_flags = link_flags,
cgo_link_flags = cgo_link_flags,
visibility = ["//visibility:public"],
Expand All @@ -163,7 +164,7 @@ def declare_toolchains(host_goos, host_goarch):
go_toolchain_build = """
load("//:toolchain.bzl", "declare_toolchains")

declare_toolchains("{goos}", "{goarch}")
declare_toolchains("{goos}", "{goarch}", ":pack_reset")
"""

def _nixpkgs_go_toolchain_impl(repository_ctx):
Expand Down
Loading