Remove --apple_compiler.

RELNOTES[INC]: The --apple_compiler command line option is not available anymore. PiperOrigin-RevId: 555975854 Change-Id: I41f06333d47224c3fb799bd89dec6752199595df
bazelbuild · Aug 11, 2023 · 1acdfc4 · 1acdfc4
1 parent 60abcf1
commit 1acdfc4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 20 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -195,20 +195,6 @@ public class AppleCommandLineOptions extends FragmentOptions {
   /** The default Catalyst CPU value. */
   public static final String DEFAULT_CATALYST_CPU = "x86_64";
 
-  @Option(
-    name = "apple_compiler",
-    defaultValue = "null",
-    documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
-    effectTags = {
-      OptionEffectTag.AFFECTS_OUTPUTS,
-      OptionEffectTag.LOADING_AND_ANALYSIS,
-      OptionEffectTag.LOSES_INCREMENTAL_STATE,
-    },
-    help = "The Apple target compiler. Useful for selecting variants of a toolchain "
-               + "(e.g. xcode-beta)."
-  )
-  public String cppCompiler;
-
   @Option(
     name = "apple_grte_top",
     defaultValue = "null",

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java
@@ -801,7 +801,7 @@ private static void setAppleCrosstoolTransitionSharedConfiguration(
 
     AppleCommandLineOptions appleOptions = from.get(AppleCommandLineOptions.class);
     CppOptions toCppOptions = to.get(CppOptions.class);
-    toCppOptions.cppCompiler = appleOptions.cppCompiler;
+    toCppOptions.cppCompiler = null;
     toCppOptions.libcTopLabel = appleOptions.appleLibcTop;
 
     // OSX toolchains do not support fission.

diff --git a/src/main/starlark/builtins_bzl/common/objc/transitions.bzl b/src/main/starlark/builtins_bzl/common/objc/transitions.bzl
@@ -90,7 +90,7 @@ DEFAULT_CATALYST_CPU = "x86_64"
 def _output_dictionary(settings, cpu, platform_type, platforms):
     return {
         "//command_line_option:apple configuration distinguisher": "applebin_" + platform_type,
-        "//command_line_option:compiler": settings["//command_line_option:apple_compiler"],
+        "//command_line_option:compiler": None,
         "//command_line_option:cpu": cpu,
         "//command_line_option:crosstool_top": (
             settings["//command_line_option:apple_crosstool_top"]
@@ -122,7 +122,6 @@ def _apple_crosstool_transition_impl(settings, attr):
 
 _apple_rule_base_transition_inputs = [
     "//command_line_option:apple configuration distinguisher",
-    "//command_line_option:apple_compiler",
     "//command_line_option:apple_platform_type",
     "//command_line_option:apple_platforms",
     "//command_line_option:apple_crosstool_top",

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -526,7 +526,6 @@ protected static void addAppleBinaryStarlarkRule(Scratch scratch) throws Excepti
     scratch.file(
         "test_starlark/apple_binary_starlark.bzl",
         "_apple_platform_transition_inputs = [",
-        "    '//command_line_option:apple_compiler',",
         "    '//command_line_option:apple_crosstool_top',",
         "    '//command_line_option:cpu',",
         "    '//command_line_option:ios_multi_cpus',",
@@ -552,8 +551,7 @@ protected static void addAppleBinaryStarlarkRule(Scratch scratch) throws Excepti
         "        '//command_line_option:apple_platform_type': platform_type,",
         "        '//command_line_option:apple_platforms': [],",
         "        '//command_line_option:apple_split_cpu': environment_arch,",
-        "        '//command_line_option:compiler': ",
-        "            settings['//command_line_option:apple_compiler'],",
+        "        '//command_line_option:compiler': None,",
         "        '//command_line_option:cpu': ",
         "            'darwin_' + environment_arch if platform_type == 'macos'",
         "            else platform_type + '_' +  environment_arch,",