Temporarily disable consistent split transitioning on apple_binary rules.

If minimum_os is unspecified on an apple_binary target and ios_multi_cpus is not set, no
apple_binary configuration transition is made.

RELNOTES: None.
PiperOrigin-RevId: 153529598

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java
index 5cbb4d98ed..6c56907e69 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java
@@ -165,7 +165,9 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider
       switch (platformType) {
         case IOS:
           cpus = buildOptions.get(AppleCommandLineOptions.class).iosMultiCpus;
-          if (cpus.isEmpty()) {
+          // TODO(b/37463474): Temporary workaround to prevent a split transition with default
+          // flag values: Don't transition unless minimum_os or ios_multi_versions are specified!
+          if (cpus.isEmpty() && minimumOsVersion.isPresent()) {
             cpus = ImmutableList.of(buildOptions.get(AppleCommandLineOptions.class).iosCpu);
           }
           configurationDistinguisher = ConfigurationDistinguisher.APPLEBIN_IOS;