diff options
author | Brian Silverman <bsilver16384@gmail.com> | 2015-11-02 16:46:23 +0000 |
---|---|---|
committer | Florian Weikert <fwe@google.com> | 2015-11-02 16:57:28 +0000 |
commit | b92ff43bcb5653442e36b1d68403439b4ac65d33 (patch) | |
tree | 9b1ddfaf242ece6f3e774ff9f2989a5ea351880c /src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java | |
parent | 093d995cf1298aadedb0e39356dc61bb0db403dc (diff) |
Add runfiles for HOST executables for actions without commands too
6c51059e0a04d4170d10bfedbd9553b498cf28e7 adds the runfiles for HOST
executables listed as inputs to SpawnActions with a command, but it
seems reasonable to be able to execute those with non-command
SpawnActions (ie shell scripts) too.
--
Change-Id: I33b0fe3936afa87c69046350a53ee1485f2beab3
Reviewed-on: https://bazel-review.googlesource.com/#/c/2260/
MOS_MIGRATED_REVID=106845702
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java index facba30099..fda179331f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleImplementationFunctions.java @@ -260,12 +260,13 @@ public class SkylarkRuleImplementationFunctions { + "command instead of " + EvalUtils.getDataTypeName(commandO)); } - - // The actual command can refer to an executable from the inputs, which could - // require some runfiles. Consequently, we add the runfiles of every executable - // input file that is in HOST configuration to the action as a precaution. - addRequiredIndirectRunfiles(ctx, builder); } + + // The actual command can refer to an executable from the inputs, which could + // require some runfiles. Consequently, we add the runfiles of every executable + // input file that is in HOST configuration to the action as a precaution. + addRequiredIndirectRunfiles(ctx, builder); + if (mnemonicO != Runtime.NONE) { builder.setMnemonic((String) mnemonicO); } |