From 8da3094e26210b8f52c9db99e6d0398ba62d8448 Mon Sep 17 00:00:00 2001 From: Chris Sauer Date: Sat, 12 Aug 2023 01:15:07 -0700 Subject: [PATCH] Fix objc transition for cc_binary --- src/main/starlark/builtins_bzl/common/objc/transitions.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/starlark/builtins_bzl/common/objc/transitions.bzl b/src/main/starlark/builtins_bzl/common/objc/transitions.bzl index 8be36e18b2354e..2d38f972faf336 100644 --- a/src/main/starlark/builtins_bzl/common/objc/transitions.bzl +++ b/src/main/starlark/builtins_bzl/common/objc/transitions.bzl @@ -56,12 +56,12 @@ def _determine_single_architecture(platform_type, settings): return DEFAULT_TVOS_CPU return tvos_cpus[0] if platform_type == MACOS: - macos_cpus = settings["//command_line_option:macos_cpus"] - if macos_cpus: - return macos_cpus[0] cpu_value = settings["//command_line_option:cpu"] if cpu_value.startswith(DARWIN_CPU_PREFIX): return cpu_value[len(DARWIN_CPU_PREFIX):] + macos_cpus = settings["//command_line_option:macos_cpus"] + if macos_cpus: + return macos_cpus[0] return DEFAULT_MACOS_CPU if platform_type == CATALYST: catalyst_cpus = settings["//command_line_option:catalyst_cpus"]