aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Kristina Chodorow <kchodorow@google.com>2016-05-10 22:43:53 +0000
committerGravatar Klaus Aehlig <aehlig@google.com>2016-05-11 10:23:56 +0000
commitaf4c3a9bb9bfd3d56ab56dcc4f14a9318e5ec4b5 (patch)
treefc0d31e0b642241a841d7b4a02ea51718988a315 /src/main
parentd15c5be755b86017a19864a230e613c166d63737 (diff)
Flip --deep_execroot to default to true
-- MOS_MIGRATED_REVID=121996611
Diffstat (limited to 'src/main')
-rw-r--r--src/main/cpp/blaze_startup_options_common.cc2
-rw-r--r--src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 779caf5d98..4df4d66e7a 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -38,7 +38,7 @@ void BlazeStartupOptions::Init() {
blaze_util::ToLower(&product);
output_user_root = blaze_util::JoinPath(
output_root, "_" + product + "_" + GetUserName());
- deep_execroot = false;
+ deep_execroot = true;
block_for_lock = true;
host_jvm_debug = false;
host_javabase = "";
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index 786d8b3545..41690a7dc5 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -159,7 +159,7 @@ public class BlazeServerStartupOptions extends OptionsBase {
public boolean batch;
@Option(name = "deep_execroot",
- defaultValue = "false", // NOTE: purely decorative! See class docstring.
+ defaultValue = "true", // NOTE: purely decorative! See class docstring.
category = "server startup",
help = "If set, the execution root will be under $OUTPUT_BASE/execroot instead of "
+ "$OUTPUT_BASE")