Try again

wpilibsuite · Jan 2, 2025 · dc6d118 · dc6d118
1 parent 74f7678
commit dc6d118
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/toolchains/configure_cross_compiler.bzl b/toolchains/configure_cross_compiler.bzl
@@ -39,6 +39,7 @@ def configure_cross_compiler_impl(repository_ctx):
 
     BINARIES = [
         "ar",
+        "as",
         "cpp",
         "gcc",
         "gcov",
@@ -51,15 +52,22 @@ def configure_cross_compiler_impl(repository_ctx):
     compiler_workspace = Label("@" + substitutions["{compiler_repo}"]).workspace_name
     substitutions["{actual_compiler_path}"] = compiler_workspace
 
+    print(substitutions["{compiler_repo}"])
+    print(substitutions["{bin_subfolder}"])
+    print(substitutions)
+
+    dist_rel_path = "../../external/" + compiler_workspace + "/" + substitutions["{bin_subfolder}"] + "/"
     for binary in BINARIES:
         bin_substitution = dict(substitutions)
         bin_substitution["{binary_target}"] = binary
         bin_substitution["{compiler_workspace}"] = compiler_workspace
         repository_ctx.template(
-            "bin/" + binary + substitutions["{wrapper_extension}"],
+            "bin/" + binary + "2" + substitutions["{wrapper_extension}"],
             repository_ctx.path(Label("@rules_bzlmodrio_toolchains//toolchains/cross_compiler:command_wrapper.tpl")),
             substitutions = bin_substitution,
         )
+
+        repository_ctx.symlink(dist_rel_path + substitutions["{binary_prefix}"] + binary, "bin/" + binary + substitutions["{wrapper_extension}"],)
 
     repository_ctx.template(
         "BUILD.bazel",