From 89b1094e58433dd742b630da0fb95a67979f682a Mon Sep 17 00:00:00 2001
From: Mauricio Garcia <mauriciogs@google.com>
Date: Fri, 1 Jul 2022 12:29:12 -0700
Subject: [PATCH] Use cc_toolchain_info_support for Apple framework import
 rules

For consistency, use cc_toolchain_info_support to parse cc_toolchain
target triplet to retrieve the effective architecture.

PiperOrigin-RevId: 458522032
(cherry picked from commit 3baf00db8fc373bdd9a03647679d25cf142425a2)
---
 apple/internal/BUILD                      |  1 +
 apple/internal/apple_framework_import.bzl | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/apple/internal/BUILD b/apple/internal/BUILD
index 08470b00c9..a5aef63b26 100644
--- a/apple/internal/BUILD
+++ b/apple/internal/BUILD
@@ -51,6 +51,7 @@ bzl_library(
         "//apple:__subpackages__",
     ],
     deps = [
+        ":cc_toolchain_info_support",
         ":framework_import_support",
         ":resources",
         ":rule_factory",
diff --git a/apple/internal/apple_framework_import.bzl b/apple/internal/apple_framework_import.bzl
index fcfec0ce68..db7d16d8bb 100644
--- a/apple/internal/apple_framework_import.bzl
+++ b/apple/internal/apple_framework_import.bzl
@@ -38,6 +38,10 @@ load(
     "@build_bazel_rules_apple//apple:providers.bzl",
     "AppleFrameworkImportInfo",
 )
+load(
+    "@build_bazel_rules_apple//apple/internal:cc_toolchain_info_support.bzl",
+    "cc_toolchain_info_support",
+)
 load(
     "@build_bazel_rules_apple//apple/internal:resources.bzl",
     "resources",
@@ -346,9 +350,9 @@ def _apple_dynamic_framework_import_impl(ctx):
     )
 
     # Create AppleFrameworkImportInfo provider.
-    cpu = cc_toolchain.target_gnu_system_name.split("-")[0]
+    target_triplet = cc_toolchain_info_support.get_apple_clang_triplet(cc_toolchain)
     providers.append(framework_import_support.framework_import_info_with_dependencies(
-        build_archs = [cpu],
+        build_archs = [target_triplet.architecture],
         deps = deps,
         debug_info_binaries = debug_info_binaries,
         dsyms = dsym_imports,
@@ -439,9 +443,9 @@ def _common_static_framework_import_impl(ctx, is_xcframework):
     )
 
     # Create AppleFrameworkImportInfo provider.
-    cpu = cc_toolchain.target_gnu_system_name.split("-")[0]
+    target_triplet = cc_toolchain_info_support.get_apple_clang_triplet(cc_toolchain)
     providers.append(framework_import_support.framework_import_info_with_dependencies(
-        build_archs = [cpu],
+        build_archs = [target_triplet.architecture],
         deps = deps,
         debug_info_binaries = [],
         dsyms = [],
@@ -466,7 +470,7 @@ def _common_static_framework_import_impl(ctx, is_xcframework):
         if _is_debugging(compilation_mode):
             swiftmodule = _swiftmodule_for_cpu(
                 framework_imports_by_category.swift_module_imports,
-                cpu,
+                target_triplet.architecture,
             )
             if swiftmodule:
                 additional_objc_provider_fields.update(_ensure_swiftmodule_is_embedded(swiftmodule))