646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
|
|
index a982b782e1..d49b047074 100644
|
|
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
|
|
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
|
|
@@ -89,13 +89,13 @@ public class BazelRuleClassProvider {
|
|
public boolean useStrictActionEnv;
|
|
}
|
|
|
|
- private static final PathFragment FALLBACK_SHELL = PathFragment.create("/bin/bash");
|
|
+ private static final PathFragment FALLBACK_SHELL = PathFragment.create("@defaultBash@");
|
|
|
|
public static final ImmutableMap<OS, PathFragment> SHELL_EXECUTABLE =
|
|
ImmutableMap.<OS, PathFragment>builder()
|
|
.put(OS.WINDOWS, PathFragment.create("c:/msys64/usr/bin/bash.exe"))
|
|
- .put(OS.FREEBSD, PathFragment.create("/usr/local/bin/bash"))
|
|
- .put(OS.OPENBSD, PathFragment.create("/usr/local/bin/bash"))
|
|
+ .put(OS.FREEBSD, PathFragment.create("@defaultBash@"))
|
|
+ .put(OS.OPENBSD, PathFragment.create("@defaultBash@"))
|
|
.put(OS.UNKNOWN, FALLBACK_SHELL)
|
|
.buildOrThrow();
|
|
|
|
|