Default --experimental_exec_configuration_distinguisher to off

bazelbuild · Jan 2, 2023 · 5a56183 · 5a56183
1 parent 6ec7e0e
commit 5a56183
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -311,7 +311,7 @@ public ExecConfigurationDistinguisherSchemeConverter() {
 
   @Option(
       name = "experimental_exec_configuration_distinguisher",
-      defaultValue = "legacy",
+      defaultValue = "off",
       converter = ExecConfigurationDistinguisherSchemeConverter.class,
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java
@@ -187,6 +187,7 @@ private static BuildOptions transitionImpl(BuildOptionsView options, Label execu
           break;
         default:
           // else if OFF do nothing
+          coreOptions.platformSuffix = "exec";
       }
 
       return result;

diff --git a/...st/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactoryTest.java b/...st/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactoryTest.java
@@ -212,7 +212,6 @@ public void executionTransition_confDist_off()
             new StoredEventHandler());
 
     assertThat(result.get(CoreOptions.class).affectedByStarlarkTransition).isEmpty();
-    assertThat(result.get(CoreOptions.class).platformSuffix)
-        .isEqualTo(options.get(CoreOptions.class).platformSuffix);
+    assertThat(result.get(CoreOptions.class).platformSuffix).isEqualTo("exec");
   }
 }