diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/cpp')
3 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java index 8c91d6be80..97b1742631 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcBinary.java @@ -22,7 +22,7 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.lib.actions.Action; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ExecutionRequirements; -import com.google.devtools.build.lib.actions.ParameterFile; +import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; @@ -35,6 +35,7 @@ import com.google.devtools.build.lib.analysis.RunfilesSupport; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.actions.CustomCommandLine; import com.google.devtools.build.lib.analysis.actions.FileWriteAction; +import com.google.devtools.build.lib.analysis.actions.ParamFileInfo; import com.google.devtools.build.lib.analysis.actions.SpawnAction; import com.google.devtools.build.lib.analysis.test.ExecutionInfo; import com.google.devtools.build.lib.analysis.test.InstrumentedFilesProvider; @@ -627,7 +628,8 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory { CustomCommandLine.Builder commandLine = CustomCommandLine.builder(); Action[] build(RuleContext context) { - spawnAction.setCommandLine(commandLine.build()); + spawnAction.addCommandLine( + commandLine.build(), ParamFileInfo.builder(ParameterFileType.UNQUOTED).build()); return spawnAction.build(context); } } @@ -696,8 +698,7 @@ public abstract class CcBinary implements RuleConfiguredTargetFactory { packager .spawnAction .addTransitiveInputs(dwpTools) - .setExecutable(cppConfiguration.getDwpExecutable()) - .useParameterFile(ParameterFile.ParameterFileType.UNQUOTED); + .setExecutable(cppConfiguration.getDwpExecutable()); return packager; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java index 7acc41f935..48afc4455f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java @@ -154,7 +154,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { .setProgressMessage( "LLVMUnzipProfileAction: Generating %s", rawProfileArtifact.prettyPrint()) .setMnemonic("LLVMUnzipProfileAction") - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .addExecPath("xf", zipProfileArtifact) .add( @@ -192,7 +192,7 @@ public class CcToolchain implements RuleConfiguredTargetFactory { .setExecutable(cppConfiguration.getLLVMProfDataExecutable()) .setProgressMessage("LLVMProfDataAction: Generating %s", profileArtifact.prettyPrint()) .setMnemonic("LLVMProfDataAction") - .setCommandLine( + .addCommandLine( CustomCommandLine.builder() .add("merge") .add("-o") diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java index 5273d32226..da85efa79e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppHelper.java @@ -664,7 +664,7 @@ public class CppHelper { .setExecutionInfo(executionInfoBuilder.build()) .setProgressMessage("Stripping %s for %s", output.prettyPrint(), context.getLabel()) .setMnemonic("CcStrip") - .setCommandLine(CustomCommandLine.builder().addAll(commandLine).build()) + .addCommandLine(CustomCommandLine.builder().addAll(commandLine).build()) .build(context); context.registerAction(stripAction); } |