aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar ccalvarin <ccalvarin@google.com>2018-02-23 15:23:06 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-23 15:25:20 -0800
commit62476a2738456c14bf92b6bcc81ade2c93ca7e87 (patch)
tree2c81d6598eedb7868abcd288d72eab47fc9af967 /src/main
parent14e549cc6596f67ed22c1bac0819f0775e4fb806 (diff)
Flip --expand_configs_in_place to true by default in Bazel.
See https://blog.bazel.build/2018/01/19/config-parsing-order.html for context on this change. RELNOTES: --config flags now expand in place by default. PiperOrigin-RevId: 186831701
Diffstat (limited to 'src/main')
-rw-r--r--src/main/cpp/startup_options.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/startup_options.cc b/src/main/cpp/startup_options.cc
index fa2f1e02b4..0ff6d13e32 100644
--- a/src/main/cpp/startup_options.cc
+++ b/src/main/cpp/startup_options.cc
@@ -91,7 +91,7 @@ StartupOptions::StartupOptions(const string &product_name,
client_debug(false),
java_logging_formatter(
"com.google.devtools.build.lib.util.SingleLineFormatter"),
- expand_configs_in_place(false),
+ expand_configs_in_place(true),
original_startup_options_(std::vector<RcStartupFlag>()) {
bool testing = !blaze::GetEnv("TEST_TMPDIR").empty();
if (testing) {
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 c2290ca917..8cccbacbfe 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
@@ -430,7 +430,7 @@ public class BlazeServerStartupOptions extends OptionsBase {
@Option(
name = "expand_configs_in_place",
- defaultValue = "false",
+ defaultValue = "true", // NOTE: purely decorative!
category = "server startup",
documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS,
effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION, OptionEffectTag.CHANGES_INPUTS},