Skip to content

Commit b8a4a44

Browse files
comiusluispadron
authored andcommitted
Replace apple_common.compilation_support with rules_cc objc_compilation_support
Cherry-pick: 4b43d5d
1 parent ad97ab6 commit b8a4a44

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

apple/internal/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ bzl_library(
361361
":rule_support",
362362
"@bazel_skylib//lib:collections",
363363
"@build_bazel_apple_support//lib:lipo",
364+
"@rules_cc//cc/private/rules_impl:objc_common",
364365
],
365366
)
366367

apple/internal/linking_support.bzl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
load("@build_bazel_apple_support//lib:lipo.bzl", "lipo")
1818
load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
1919
load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
20+
load(
21+
"@rules_cc//cc/private/rules_impl:objc_compilation_support.bzl",
22+
objc_compilation_support = "compilation_support",
23+
)
2024
load(
2125
"//apple/internal:cc_toolchain_info_support.bzl",
2226
"cc_toolchain_info_support",
@@ -79,7 +83,7 @@ def _archive_multi_arch_static_library(
7983

8084
for split_transition_key, child_toolchain in cc_toolchains.items():
8185
cc_toolchain = child_toolchain[cc_common.CcToolchainInfo]
82-
common_variables = apple_common.compilation_support.build_common_variables(
86+
common_variables = objc_compilation_support.build_common_variables(
8387
ctx = ctx,
8488
toolchain = cc_toolchain,
8589
use_pch = True,
@@ -238,7 +242,7 @@ def _link_multi_arch_binary(
238242
deps = split_deps.get(split_transition_key, [])
239243
platform_info = child_toolchain[ApplePlatformInfo]
240244

241-
common_variables = apple_common.compilation_support.build_common_variables(
245+
common_variables = objc_compilation_support.build_common_variables(
242246
ctx = ctx,
243247
toolchain = cc_toolchain,
244248
deps = deps,

0 commit comments

Comments
 (0)