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 index 8681bccf885958..3cd624822fb79f 100644 --- 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 @@ -465,14 +465,7 @@ public static ImmutableMap handleApplePlatforms( // The cpu flag will be set by platform mapping if a mapping exists. splitOptions.get(PlatformOptions.class).platforms = ImmutableList.of(platform); - if (splitOptions.get(ObjcCommandLineOptions.class).enableCcDeps) { - // Only set the (CC-compilation) configs for dependencies if explicitly required by the - // user. - // This helps users of the iOS rules who do not depend on CC rules as these config values - // require additional flags to work (e.g. a custom crosstool) which now only need to be - // set if this feature is explicitly requested. - setAppleCrosstoolTransitionPlatformConfiguration(buildOptions, splitOptions, platform); - } + setAppleCrosstoolTransitionPlatformConfiguration(buildOptions, splitOptions, platform); AppleCommandLineOptions appleCommandLineOptions = splitOptions.get(AppleCommandLineOptions.class); // Set the configuration distinguisher last, as the method @@ -604,13 +597,7 @@ public static ImmutableMap handleAppleCpus( appleCommandLineOptions.appleSplitCpu = cpu; String platformCpu = ApplePlatform.cpuStringForTarget(platformType, cpu); - if (splitOptions.get(ObjcCommandLineOptions.class).enableCcDeps) { - // Only set the (CC-compilation) CPU for dependencies if explicitly required by the user. - // This helps users of the iOS rules who do not depend on CC rules as these CPU values - // require additional flags to work (e.g. a custom crosstool) which now only need to be - // set if this feature is explicitly requested. - setAppleCrosstoolTransitionCpuConfiguration(buildOptions, splitOptions, platformCpu); - } + setAppleCrosstoolTransitionCpuConfiguration(buildOptions, splitOptions, platformCpu); // Set the configuration distinguisher last, as setAppleCrosstoolTransitionCpuConfiguration // will set this value to the Apple CROSSTOOL configuration distinguisher, and we want to make // sure it's set for the right platform instead in this split transition. diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index d4512fef2cc51e..c6e95423cf69da 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -57,18 +57,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { ) public boolean runMemleaks; - @Option( - name = "experimental_enable_objc_cc_deps", - defaultValue = "true", - documentationCategory = OptionDocumentationCategory.TOOLCHAIN, - metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, - effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - help = - "Allows objc_* rules to depend on cc_library and causes any objc dependencies to be " - + "built with --cpu set to \"ios_<--ios_cpu>\" for any values in --ios_multi_cpu." - ) - public boolean enableCcDeps; - @Option( name = "experimental_objc_fastbuild_options", defaultValue = "-O0,-DDEBUG=1", @@ -167,7 +155,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Override public FragmentOptions getExec() { ObjcCommandLineOptions exec = (ObjcCommandLineOptions) getDefault(); - exec.enableCcDeps = enableCcDeps; exec.incompatibleAvoidHardcodedObjcCompilationFlags = incompatibleAvoidHardcodedObjcCompilationFlags; exec.incompatibleDisallowSdkFrameworksAttributes = incompatibleDisallowSdkFrameworksAttributes;