aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-06-07 19:31:01 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-06-08 08:51:07 +0000
commit9c72e5429ea4793540c0eef2624ba7de6430aa4a (patch)
tree25fcf1ea2d6ce88d6b22abad2c26a588619a136b /src/main/java
parentcaa000a35d893dbd31dfdde91e7be4f678ff7066 (diff)
Sets default shell executable for windows to msys64 bash.exe path because
/bin/bash is always wrong on windows. -- MOS_MIGRATED_REVID=124273700
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
index e28a394133..277e621e52 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
@@ -61,8 +61,10 @@ public class BazelConfiguration extends Fragment {
String path = System.getenv("BAZEL_SH");
if (path != null) {
builder.put("sh", new PathFragment(path));
- return;
+ } else {
+ builder.put("sh", new PathFragment("c:/tools/msys64/usr/bin/bash.exe"));
}
+ return;
}
if (OS.getCurrent() == OS.FREEBSD) {
String path = System.getenv("BAZEL_SH");