WIP2

Author: UebelAndre

examples/cross_compile/BUILD.bazel

@@ -4,11 +4,14 @@ load("//tools:infer_test.bzl", "infer_test")
 
 PLATFORMS = [
     "aarch64-apple-darwin",
-    "aarch64-pc-windows-msvc",
-    "aarch64-unknown-linux-gnu",
+    "aarch64-unknown-linux-musl",
     "wasm32-wasip1",
+    "x86_64-unknown-linux-musl",
+
+    # TODO: Windows requires additional libraries at link time for
+    # cross-compilation. A workaround is needed.
+    "aarch64-pc-windows-msvc",
     "x86_64-pc-windows-msvc",
-    "x86_64-unknown-linux-gnu",
 ]
 
 rust_library(
@@ -35,11 +38,11 @@ rust_library(
         type = {
             "aarch64-apple-darwin": "application/x-mach-binary",
             "aarch64-pc-windows-msvc": "application/x-mach-binary",
-            "aarch64-unknown-linux-gnu": "application/elf-binary",
+            "aarch64-unknown-linux-musl": "application/x-executable",
             "wasm32-wasip1": "application/wasm",
             "x86_64-pc-windows-msvc": "application/x-mach-binary",
-            "x86_64-unknown-linux-gnu": "application/elf-binary",
-        }.get(platform, "unknown"),
+            "x86_64-unknown-linux-musl": "application/x-executable",
+        }.get(platform, platform),
     )
     for platform in PLATFORMS
 ]

examples/cross_compile/MODULE.bazel

@@ -22,13 +22,13 @@ rust.toolchain(
     extra_target_triples = [
         "aarch64-apple-darwin",
         "aarch64-pc-windows-msvc",
-        "aarch64-unknown-linux-gnu",
+        "aarch64-unknown-linux-musl",
         "wasm32-unknown-unknown",
         "wasm32-wasip1",
         "wasm32-wasip2",
         "x86_64-apple-darwin",
         "x86_64-pc-windows-msvc",
-        "x86_64-unknown-linux-gnu",
+        "x86_64-unknown-linux-musl",
     ],
     versions = [RUST_VERSION],
 )

examples/cross_compile/platforms/BUILD.bazel

@@ -16,6 +16,22 @@ platform(
     ],
 )
 
+platform(
+    name = "aarch64-unknown-linux-musl",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:aarch64",
+    ],
+)
+
+platform(
+    name = "x86_64-unknown-linux-musl",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:aarch64",
+    ],
+)
+
 platform(
     name = "aarch64-apple-darwin",
     constraint_values = [

rust/private/rust_allocator_libraries.bzl

@@ -89,21 +89,22 @@ def make_libstd_and_allocator_ccinfo(
 
         # Include C++ toolchain files as additional inputs for cross-compilation scenarios
         additional_inputs = []
-        if cc_toolchain and cc_toolchain.all_files:
-            additional_inputs = cc_toolchain.all_files.to_list()
+        if cc_toolchain:
+            if cc_toolchain.all_files:
+                additional_inputs = cc_toolchain.all_files.to_list()
 
-        linking_context, _linking_outputs = cc_common.create_linking_context_from_compilation_outputs(
-            name = label.name,
-            actions = actions,
-            feature_configuration = feature_configuration,
-            cc_toolchain = cc_toolchain,
-            compilation_outputs = compilation_outputs,
-            additional_inputs = additional_inputs,
-        )
+            linking_context, _linking_outputs = cc_common.create_linking_context_from_compilation_outputs(
+                name = label.name,
+                actions = actions,
+                feature_configuration = feature_configuration,
+                cc_toolchain = cc_toolchain,
+                compilation_outputs = compilation_outputs,
+                additional_inputs = additional_inputs,
+            )
 
-        cc_infos.append(CcInfo(
-            linking_context = linking_context,
-        ))
+            cc_infos.append(CcInfo(
+                linking_context = linking_context,
+            ))
 
     if rust_stdlib_info.std_rlibs:
         allocator_library_inputs = []