diff options
| author |  tomlu <tomlu@google.com> | 2017-09-14 23:24:06 +0200 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-09-15 11:29:04 +0200 |
| commit | 7df9198a771ef2eabef396dcb7a21e6cbb3cabb0 (patch) | |
| tree | e8929823a7012639db9a560589b89beacecdb757 /src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | |
| parent | 2e7b804d29f3c1fa979d8a226d62d970dada64e2 (diff) | |
Support multiple command lines / params files in SpawnAction.
This is necessary for the upcoming Skylark implementation of param files.
PiperOrigin-RevId: 168744486
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java index cf15e6082f..159821f0e5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/CompilationSupport.java @@ -1138,7 +1138,7 @@ public abstract class CompilationSupport { .addTransitiveInputs(j2ObjcDependencyMappingFiles) .addTransitiveInputs(j2ObjcHeaderMappingFiles) .addTransitiveInputs(j2ObjcArchiveSourceMappingFiles) - .setCommandLine( + .addCommandLine( CustomCommandLine.builder().addFormatted("@%s", paramFile.getExecPath()).build()) .addOutput(prunedJ2ObjcArchive) .build(ruleContext)); @@ -1231,7 +1231,7 @@ public abstract class CompilationSupport { appleConfiguration, appleConfiguration.getSingleArchPlatform()) .setMnemonic("ObjcBinarySymbolStrip") .setExecutable(xcrunwrapper(ruleContext)) - .setCommandLine(symbolStripCommandLine(stripArgs, binaryToLink, strippedBinary)) + .addCommandLine(symbolStripCommandLine(stripArgs, binaryToLink, strippedBinary)) .addOutput(strippedBinary) .addInput(binaryToLink) .build(ruleContext)); @@ -1431,7 +1431,7 @@ public abstract class CompilationSupport { } ruleContext.registerAction( builder - .setCommandLine(cmdLine.add("--").addAll(args).build()) + .addCommandLine(cmdLine.add("--").addAll(args).build()) .addInputs(compilationArtifacts.getPrivateHdrs()) .addTransitiveInputs(attributes.hdrs()) .addTransitiveInputs(objcProvider.get(ObjcProvider.HEADER)) |