Enable the configuration sanity check for a subset of tests.

Also remove a try-catch block, which was converting all configuration
creation errors to IllegalStateException.

This uncovered a bug in CppOptions, which wasn't adding host_grte_top to the
set of explicit labels.

--
MOS_MIGRATED_REVID=118654358

2 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java
index bc82117dfd..cd8e10cc93 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFactory.java
@@ -64,8 +64,8 @@ public final class ConfigurationFactory {
   }
 
   @VisibleForTesting
-  public void forbidSanityCheck() {
-    performSanityCheck = false;
+  public void setSanityCheck(boolean performSanityCheck) {
+    this.performSanityCheck = performSanityCheck;
   }
 
   /** Creates a set of build configurations with top-level configuration having the given options.
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 cf8e882dda..7e9bb2a4dc 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
@@ -647,6 +647,12 @@ public class CppOptions extends FragmentOptions {
         labelMap.put("crosstool", libcLabel);
       }
     }
+    if (hostLibcTop != null) {
+      Label libcLabel = hostLibcTop.getLabel();
+      if (libcLabel != null) {
+        labelMap.put("crosstool", libcLabel);
+      }
+    }
     addOptionalLabel(labelMap, "fdo", fdoOptimize);
 
     if (stl != null) {