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
index f513f3820d3479..2a01f9bdcf6f07 100644
--- 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
@@ -670,6 +670,10 @@ public FragmentOptions getHost() {
     // === Pass on C++ compiler features.
     host.defaultFeatures = ImmutableList.copyOf(defaultFeatures);
 
+    // Save host options in case of a further exec->host transition.
+    host.hostCpu = hostCpu;
+    host.hostCompilationMode = hostCompilationMode;
+
     return host;
   }