aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/cpp/blaze.cc
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2017-03-06 11:21:35 +0000
committerGravatar Vladimir Moskva <vladmos@google.com>2017-03-06 14:43:55 +0000
commitbfd9aa359addb582b4f29e54ab09fc350e927e31 (patch)
tree56893317072ed4a6a027a2f53ac0d1f6667c48ce /src/main/cpp/blaze.cc
parent86490498d710361f6fc8245bf7eb42dec02fae0b (diff)
Convey the value of the --host_javabase startup option to the server.
-- PiperOrigin-RevId: 149282686 MOS_MIGRATED_REVID=149282686
Diffstat (limited to 'src/main/cpp/blaze.cc')
-rw-r--r--src/main/cpp/blaze.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index eec8f47ffc..5fdf5adcff 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -481,6 +481,11 @@ static vector<string> GetArgumentArray() {
result.push_back("--use_custom_exit_code_on_abrupt_exit=false");
}
+ if (!globals->options->GetExplicitHostJavabase().empty()) {
+ result.push_back("--host_javabase=" +
+ globals->options->GetExplicitHostJavabase());
+ }
+
// This is only for Blaze reporting purposes; the real interpretation of the
// jvm flags occurs when we set up the java command line.
if (globals->options->host_jvm_debug) {