1 files changed, 3 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
index fbd2092fb0..77b4671aa8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BundleSupport.java
@@ -198,7 +198,8 @@ final class BundleSupport {
         .addPath(zipOutput.getExecPath())
         .add(archiveRoot)
         .addPath(ObjcRuleClasses.IBTOOL)
-        .add("--minimum-deployment-target").add(bundling.getMinimumOsVersion());
+        .add("--minimum-deployment-target").add(bundling.getMinimumOsVersion())
+        .add("--module").add(ruleContext.getLabel().getName());
 
     for (TargetDeviceFamily targetDeviceFamily : attributes.families()) {
       commandLine.add("--target-device").add(targetDeviceFamily.name().toLowerCase(Locale.US));
@@ -248,16 +249,7 @@ final class BundleSupport {
       ruleContext.registerAction(
           ObjcRuleClasses.spawnJavaOnDarwinActionBuilder(attributes.ibtoolzipDeployJar())
               .setMnemonic("XibCompile")
-              .setCommandLine(CustomCommandLine.builder()
-                  // The next three arguments are positional,
-                  // i.e. they don't have flags before them.
-                  .addPath(zipOutput.getExecPath())
-                  .add(archiveRoot)
-                  .addPath(ObjcRuleClasses.IBTOOL)
-
-                  .add("--minimum-deployment-target").add(bundling.getMinimumOsVersion())
-                  .addPath(original.getExecPath())
-                  .build())
+              .setCommandLine(ibActionsCommandLine(archiveRoot, zipOutput, original))
               .addOutput(zipOutput)
               .addInput(original)
               .build(ruleContext));