wip

Author: UebelAndre

examples/cross_compile/BUILD.bazel

@@ -32,12 +32,14 @@ rust_library(
     infer_test(
         name = "cross_compile_{}_infer_test".format(platform),
         file = ":cross_compile_{}".format(platform),
-        type = select({
-            "@platforms//os:macos": "application/x-mach-binary",
-            "@platforms//os:none": "application/x-mach-binary",
-            "@platforms//os:windows": "application/x-mach-binary",
-            "//conditions:default": "application/elf-binary",
-        }),
+        type = {
+            "aarch64-apple-darwin": "application/x-mach-binary",
+            "aarch64-pc-windows-msvc": "application/x-mach-binary",
+            "aarch64-unknown-linux-gnu": "application/elf-binary",
+            "wasm32-wasip1": "application/wasm",
+            "x86_64-pc-windows-msvc": "application/x-mach-binary",
+            "x86_64-unknown-linux-gnu": "application/elf-binary",
+        }.get(platform, "unknown"),
     )
     for platform in PLATFORMS
 ]

rust/extensions.bzl

@@ -132,7 +132,7 @@ def _rust_impl(module_ctx):
     return module_ctx.extension_metadata(**metadata_kwargs)
 
 _COMMON_TAG_DEFAULTS = {
-    "allocator_library": "@rules_rust//ffi/cc/allocator_library",
+    "allocator_library": "",
     "rustfmt_version": DEFAULT_NIGHTLY_VERSION,
     "urls": DEFAULT_STATIC_RUST_URL_TEMPLATES,
 }

rust/private/cc/BUILD.bazel

@@ -2,6 +2,7 @@ load(":cc_utils.bzl", "cc_empty_library")
 
 cc_empty_library(
     name = "empty",
+    visibility = ["//visibility:public"],
 )
 
 alias(

rust/repositories.bzl

@@ -359,7 +359,7 @@ def rust_repositories(**kwargs):
 _RUST_TOOLCHAIN_REPOSITORY_ATTRS = {
     "allocator_library": attr.string(
         doc = "Target that provides allocator functions when rust_library targets are embedded in a cc_binary.",
-        default = "@rules_rust//ffi/cc/allocator_library",
+        # default = "@rules_rust//ffi/cc/allocator_library",
     ),
     "auth": attr.string_dict(
         doc = (
@@ -392,7 +392,7 @@ _RUST_TOOLCHAIN_REPOSITORY_ATTRS = {
     ),
     "global_allocator_library": attr.string(
         doc = "Target that provides allocator functions when a global allocator is used with cc_common.link.",
-        default = "@rules_rust//ffi/cc/global_allocator_library",
+        # default = "@rules_rust//ffi/cc/global_allocator_library",
     ),
     "netrc": attr.string(
         doc = ".netrc file to use for authentication; mirrors the eponymous attribute from http_archive",

rust/toolchain.bzl

@@ -636,7 +636,8 @@ rust_toolchain = rule(
     attrs = {
         "allocator_library": attr.label(
             doc = "Target that provides allocator functions when rust_library targets are embedded in a cc_binary.",
-            default = "@rules_rust//ffi/cc/allocator_library",
+            # default = "@rules_rust//ffi/cc/allocator_library",
+            default = Label("//rust/private/cc:empty"),
         ),
         "binary_ext": attr.string(
             doc = "The extension for binaries created from rustc.",
@@ -717,7 +718,8 @@ rust_toolchain = rule(
         ),
         "global_allocator_library": attr.label(
             doc = "Target that provides allocator functions for when a global allocator is present.",
-            default = "@rules_rust//ffi/cc/global_allocator_library",
+            # default = "@rules_rust//ffi/cc/global_allocator_library",
+            default = Label("//rust/private/cc:empty"),
         ),
         "linker": attr.label(
             doc = "The label to an explicit linker to use (e.g. rust-lld, ld, link-ld.exe, etc.). Linker binaries must be runnable in the exec configuration, so cfg = \"exec\" is used. To choose a linker based on the target platform, use a select() when providing this attribute. The select() will be evaluated against the target platform before the exec transition is applied, allowing platform-specific linker selection while ensuring the selected linker is built for the exec platform.",