From 395a1c65db6847f647137ecc4ce5fd1722e46bf1 Mon Sep 17 00:00:00 2001
From: mai93 <messa@google.com>
Date: Mon, 14 Dec 2020 14:15:41 +0200
Subject: [PATCH] Retry initial commit

---
 .../lib/analysis/config/ExecutionTransitionFactory.java      | 5 +++--
 1 file changed, 3 insertions(+), 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
index 54c07569fc196d..c0ee7501ae1ae3 100644
--- 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(