From 262b0662156c41eb414b863cd33e494841036c80 Mon Sep 17 00:00:00 2001 From: Ivo Ristovski List Date: Tue, 28 Oct 2025 01:37:26 -0700 Subject: [PATCH 1/2] Replace `apple_common.compilation_support.build_common_variables` with rules_cc version Needed for Bazel 9. PiperOrigin-RevId: 824908997 (cherry picked from commit 4b43d5d1679cb618890d0aa332fe833bad581f09) Signed-off-by: Brentley Jones --- apple/internal/BUILD | 1 + apple/internal/linking_support.bzl | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apple/internal/BUILD b/apple/internal/BUILD index f40dc13d23..b17ee52ede 100644 --- a/apple/internal/BUILD +++ b/apple/internal/BUILD @@ -335,6 +335,7 @@ bzl_library( ":rule_support", "@bazel_skylib//lib:collections", "@build_bazel_apple_support//lib:lipo", + "@rules_cc//cc/private/rules_impl:objc_compilation_support_bzl", ], ) diff --git a/apple/internal/linking_support.bzl b/apple/internal/linking_support.bzl index 3f20ca2ebe..13869d5505 100644 --- a/apple/internal/linking_support.bzl +++ b/apple/internal/linking_support.bzl @@ -21,6 +21,10 @@ load( load("@build_bazel_apple_support//lib:lipo.bzl", "lipo") load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") +load( + "@rules_cc//cc/private/rules_impl:objc_compilation_support.bzl", + objc_compilation_support = "compilation_support" +) # buildifier: disable=bzl-visibility load( "//apple/internal:cc_toolchain_info_support.bzl", "cc_toolchain_info_support", @@ -78,7 +82,7 @@ def _archive_multi_arch_static_library( for split_transition_key, child_toolchain in cc_toolchains.items(): cc_toolchain = child_toolchain[cc_common.CcToolchainInfo] - common_variables = apple_common.compilation_support.build_common_variables( + common_variables = objc_compilation_support.build_common_variables( ctx = ctx, toolchain = cc_toolchain, use_pch = True, @@ -245,7 +249,7 @@ def _link_multi_arch_binary( deps = split_deps.get(split_transition_key, []) platform_info = child_toolchain[ApplePlatformInfo] - common_variables = apple_common.compilation_support.build_common_variables( + common_variables = objc_compilation_support.build_common_variables( ctx = ctx, toolchain = cc_toolchain, deps = deps, From 3e5fd993553df8fe1d534de611dcca9f687843f2 Mon Sep 17 00:00:00 2001 From: Brentley Jones Date: Thu, 15 Jan 2026 09:01:41 -0600 Subject: [PATCH 2/2] Lint Signed-off-by: Brentley Jones --- apple/internal/linking_support.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apple/internal/linking_support.bzl b/apple/internal/linking_support.bzl index 13869d5505..e88cf0e443 100644 --- a/apple/internal/linking_support.bzl +++ b/apple/internal/linking_support.bzl @@ -23,7 +23,7 @@ load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load( "@rules_cc//cc/private/rules_impl:objc_compilation_support.bzl", - objc_compilation_support = "compilation_support" + objc_compilation_support = "compilation_support", ) # buildifier: disable=bzl-visibility load( "//apple/internal:cc_toolchain_info_support.bzl",