Return execution configuration without applying any transition

mai93 · Dec 14, 2020 · aa809e5 · aa809e5
1 parent a13f590
commit aa809e5
Showing 1 changed file with 3 additions and 2 deletions.
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
@@ -109,8 +109,9 @@ public ImmutableSet<Class<? extends FragmentOptions>> requiresOptionFragments()
 
     @Override
     public BuildOptions patch(BuildOptionsView options, EventHandler eventHandler) {
-      if (executionPlatform == null) {
-        // No execution platform is known, so don't change anything.
+      if (executionPlatform == null || options.get(CoreOptions.class).isExec) {
+        // If no execution platform is known or the input already comes from execution configuration,
+        // don't change anything and return the existing value.
         return options.underlying();
       }
       return cache.applyTransition(