Skip to content

Commit 7ec28f7

Browse files
authored
Fix CI for latest Bazel (#2780)
- Add missing bzl_library dep - Remove `apple_crosstool_top` usage, no longer used in Bazel
1 parent 1133a5f commit 7ec28f7

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

apple/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ bzl_library(
185185
"//apple/internal/resource_rules:apple_precompiled_resource_bundle",
186186
"//apple/internal/resource_rules:apple_resource_bundle",
187187
"//apple/internal/resource_rules:apple_resource_group",
188+
"@rules_cc//cc:action_names.bzl",
188189
"@rules_cc//cc:core_rules",
189190
"@rules_cc//cc:find_cc_toolchain_bzl",
190191
"@rules_cc//cc/common",

apple/internal/transition_support.bzl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,6 @@ def _command_line_options(
254254
"//command_line_option:apple_split_cpu": environment_arch if environment_arch else "",
255255
"//command_line_option:compiler": None,
256256
"//command_line_option:cpu": cpu,
257-
"//command_line_option:crosstool_top": (
258-
settings["//command_line_option:apple_crosstool_top"]
259-
),
260257
"//command_line_option:fission": [],
261258
"//command_line_option:grte_top": None,
262259
"//command_line_option:platforms": [apple_platforms[0]] if apple_platforms else default_platforms,
@@ -383,7 +380,6 @@ def _apple_rule_base_transition_impl(settings, attr):
383380
# - https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
384381
_apple_rule_common_transition_inputs = [
385382
build_settings_labels.use_tree_artifacts_outputs,
386-
"//command_line_option:apple_crosstool_top",
387383
] + _CPU_TO_DEFAULT_PLATFORM_FLAG.values()
388384
_apple_rule_base_transition_inputs = _apple_rule_common_transition_inputs + [
389385
"//command_line_option:cpu",
@@ -407,7 +403,6 @@ _apple_rule_base_transition_outputs = [
407403
"//command_line_option:apple_split_cpu",
408404
"//command_line_option:compiler",
409405
"//command_line_option:cpu",
410-
"//command_line_option:crosstool_top",
411406
"//command_line_option:fission",
412407
"//command_line_option:grte_top",
413408
"//command_line_option:ios_minimum_os",

0 commit comments

Comments
 (0)