diff options
| author |  lberki <lberki@google.com> | 2018-04-06 01:52:58 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-06 01:54:28 -0700 |
| commit | 78651d4a407fd6114d7d1129a26d5500fdeb21f2 (patch) | |
| tree | ee22d1d982268b975ab094998703c6e447d83cd1 /src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java | |
| parent | 24f19ec2679dd93b1ac5b06e46f3b35807d6e217 (diff) | |
Move shell executable to its own configuration fragment.
RELNOTES: None.
PiperOrigin-RevId: 191861074
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java index 85dfc7a043..f364257c68 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java @@ -306,6 +306,7 @@ public final class CommandHelper { private PathFragment shellPath(Map<String, String> executionInfo) { // Use vanilla /bin/bash for actions running on mac machines. return executionInfo.containsKey(ExecutionRequirements.REQUIRES_DARWIN) - ? PathFragment.create("/bin/bash") : ruleContext.getConfiguration().getShellExecutable(); + ? PathFragment.create("/bin/bash") + : ruleContext.getConfiguration().getFragment(ShellConfiguration.class).getShellExecutable(); } } |