Configurable attributes for ios_cpu should work under ios_multi_cpus.

--
MOS_MIGRATED_REVID=89038414

2 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index e452ddb38c..9b8167745b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -113,7 +113,7 @@ public class ObjcConfiguration extends BuildConfiguration.Fragment {
   }
 
   public String getIosCpu() {
-    return iosSplitCpu.isEmpty() ? iosCpu : iosSplitCpu;
+    return iosCpu;
   }
 
   public Platform getPlatform() {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
index 43edc4d564..39f0f46dc6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ReleaseBundlingSupport.java
@@ -88,6 +88,7 @@ public final class ReleaseBundlingSupport {
           for (String iosCpu : iosMultiCpus) {
             BuildOptions splitOptions = buildOptions.clone();
             splitOptions.get(ObjcCommandLineOptions.class).iosSplitCpu = iosCpu;
+            splitOptions.get(ObjcCommandLineOptions.class).iosCpu = iosCpu;
             splitBuildOptions.add(splitOptions);
           }
           return splitBuildOptions.build();