Fixed overrides

Author: longsview

xcodeproj/internal/custom_toolchain.bzl

@@ -6,23 +6,66 @@ def _custom_toolchain_impl(ctx):
     user_toolchain_path = "$(eval echo ~)/Library/Developer/Toolchains/{}.xctoolchain".format(ctx.attr.toolchain_name)
     built_toolchain_path = "$(eval pwd)/"+toolchain_dir.path
 
+    resolved_overrides = {}
+
+    for tool_name, label_target in ctx.attr.overrides.items():
+        print("DEBUG: Processing override '{}' -> '{}'".format(tool_name, label_target))
+
+        # Check if the target produces valid files
+        if hasattr(label_target, "files"):
+            files = label_target.files.to_list()
+        else:
+            files = []
+
+        if not files:
+            fail("ERROR: Override '{}' does not produce any files! Ensure it is wrapped in a `filegroup`.".format(tool_name))
+
+        # Extract the first file from the filegroup
+        resolved_path = files[0].path
+        resolved_overrides[tool_name] = resolved_path
+
+    # Debugging: Print resolved paths
+    print("Resolved overrides:", resolved_overrides)
+
     # Generate symlink creation commands dynamically, excluding plist files
+    overrides_list = " ".join(["{}={}".format(k, v) for k, v in resolved_overrides.items()])
+
     symlink_script = """#!/bin/bash
 set -e
 
 mkdir -p "{toolchain_dir}"
 
+# Process overrides manually (avoiding associative arrays)
+while IFS='=' read -r key value; do
+    if [[ -n "$key" && -n "$value" ]]; then
+        overrides="$overrides $key=$value"
+    fi
+done <<< "{overrides_list}"
+
 find "{default_toolchain}" -type f -o -type l | while read file; do
     base_name="$(basename "$file")"
     rel_path="${{file#"{default_toolchain}/"}}"
-    
-    override_path="$(echo {overrides} | jq -r --arg key "$base_name" '.[$key] // empty')"
-    if [[ -f "$override_path" ]]; then
+
+    # Check if an override exists
+    override_path=""
+    for entry in $overrides; do
+        o_key="${{entry%%=*}}"
+        o_value="${{entry#*=}}"
+        echo "Looking for Override: $o_key -> $o_value"
+        if [[ "$o_key" == "$base_name" ]]; then
+            echo "Found Override: $entry -> $o_value"
+            override_path="$o_value"
+            break
+        fi
+    done
+
+    if [[ -n "$override_path" ]]; then
         mkdir -p "{toolchain_dir}/$(dirname "$rel_path")"
         cp "$override_path" "{toolchain_dir}/$rel_path"
         continue
     fi
-    
+
+    # Symlink everything else
     if [[ "$rel_path" != "ToolchainInfo.plist" ]]; then
         mkdir -p "{toolchain_dir}/$(dirname "$rel_path")"
         ln -s "$file" "{toolchain_dir}/$rel_path"
@@ -37,13 +80,13 @@ if [ -e "{user_toolchain_path}" ]; then
 fi
 ln -s "{built_toolchain_path}" "{user_toolchain_path}"
 """.format(
-        toolchain_dir=toolchain_dir.path,
-        default_toolchain=default_toolchain_path,
-        overrides=ctx.attr.overrides,
-        toolchain_plist=toolchain_plist_file.path,
-        user_toolchain_path=user_toolchain_path,
-        built_toolchain_path=built_toolchain_path
-    )
+    toolchain_dir=toolchain_dir.path,
+    default_toolchain=default_toolchain_path,
+    overrides_list=overrides_list,
+    toolchain_plist=toolchain_plist_file.path,
+    user_toolchain_path=user_toolchain_path,
+    built_toolchain_path=built_toolchain_path
+)
 
     script_file = ctx.actions.declare_file(ctx.attr.toolchain_name + "_setup.sh")
     ctx.actions.write(output=script_file, content=symlink_script, is_executable=True)
@@ -91,7 +134,8 @@ custom_toolchain = rule(
     implementation=_custom_toolchain_impl,
     attrs={
         "toolchain_name": attr.string(mandatory=True),
-        "overrides": attr.string_dict(default={}),
+        "overrides": attr.label_keyed_string_dict(
+            allow_files=True, mandatory=False, default={}
+        ),
     },
 )
-