diff options
| author |  cushon <cushon@google.com> | 2018-05-14 01:51:45 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-14 01:53:21 -0700 |
| commit | 849df36c5ad31ebe8791c4228321c38c6d0ae56c (patch) | |
| tree | cc39afc4e667214b4aac69217fb697166c96ddd4 /src/main/cpp/blaze_util_windows.cc | |
| parent | 5c3f5c9be7fa40d4fb3c35756891fab8483ca406 (diff) | |
Use the local JDK as the default target javabase
and continue to use the embedded JDK as the default host_javabase.
PiperOrigin-RevId: 196471714
Diffstat (limited to 'src/main/cpp/blaze_util_windows.cc')
| -rw-r--r-- | src/main/cpp/blaze_util_windows.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/cpp/blaze_util_windows.cc b/src/main/cpp/blaze_util_windows.cc index efd0d72c59..565e8876c2 100644 --- a/src/main/cpp/blaze_util_windows.cc +++ b/src/main/cpp/blaze_util_windows.cc @@ -250,11 +250,10 @@ bool IsSharedLibrary(const string &filename) { return blaze_util::ends_with(filename, ".dll"); } -string GetDefaultHostJavabase() { +string GetSystemJavabase() { string javahome(GetEnv("JAVA_HOME")); if (javahome.empty()) { - BAZEL_DIE(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR) - << "Error: JAVA_HOME not set."; + return ""; } return javahome; } |