diff --git a/WORKSPACE b/WORKSPACE index 1bf0dc121e3..2f17033b7f4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,13 +2,17 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "platforms", - sha256 = "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74", + sha256 = "5eda539c841265031c2f82d8ae7a3a6490bd62176e0c038fc469eabf91f6149b", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz", ], ) +load("@platforms//host:extension.bzl", "host_platform_repo") + +host_platform_repo(name = "host_platform") + http_archive( name = "bazel_skylib", sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa", diff --git a/dev/oci_defs.bzl b/dev/oci_defs.bzl index caceaf864a2..60be494d835 100644 --- a/dev/oci_defs.bzl +++ b/dev/oci_defs.bzl @@ -32,9 +32,9 @@ def oci_image(name, **kwargs): oci_image_cross( name = name, image = ":" + name + "_underlying", - platforms = select({ - "@platforms//os:macos": [Label("@zig_sdk//platform:linux_amd64")], - "//conditions:default": [], + platform = select({ + "@platforms//os:macos": Label("@zig_sdk//platform:linux_amd64"), + "//conditions:default": Label("@platforms//host"), }), visibility = kwargs.pop("visibility", ["//visibility:public"]), ) @@ -45,13 +45,12 @@ oci_image_cross = rule( attrs = { "image": attr.label(cfg = transition( implementation = lambda settings, attr: [ - {"//command_line_option:platforms": str(platform)} - for platform in attr.platforms + {"//command_line_option:platforms": str(attr.platform), "//command_line_option:compilation_mode": "opt"}, ], inputs = [], - outputs = ["//command_line_option:platforms"], + outputs = ["//command_line_option:platforms", "//command_line_option:compilation_mode"], )), - "platforms": attr.label_list(), + "platform": attr.label(), "_allowlist_function_transition": attr.label( default = "@bazel_tools//tools/allowlists/function_transition_allowlist", ),