2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index fb84a0cce2..f09645c006 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -209,8 +209,7 @@ public final class CcCommon {
       throws EvalException {
     RuleContext context = skylarkRuleContext.getRuleContext();
     Rule rule = context.getRule();
-    if (!context.getConfiguration().isHostConfiguration()
-        && !context.getFragment(CppConfiguration.class).getEnableCcSkylarkApi()) {
+    if (!context.getFragment(CppConfiguration.class).getEnableCcSkylarkApi()) {
       throw new EvalException(
           rule.getLocation(),
           "Pass --experimental_enable_cc_skylark_api in "
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
index bcb5a7d81f..5992b22f5c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java
@@ -864,6 +864,8 @@ public class CppOptions extends FragmentOptions {
   public FragmentOptions getHost() {
     CppOptions host = (CppOptions) getDefault();
 
+    host.enableCcSkylarkApi = enableCcSkylarkApi;
+
     // The crosstool options are partially copied from the target configuration.
     if (hostCrosstoolTop == null) {
       host.cppCompiler = cppCompiler;