Improve the error message for toolchain selection when the default platform is not present.

PiperOrigin-RevId: 169387061

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index fb18457312..ff5dc00884 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
@@ -296,7 +296,11 @@ public final class SkyframeBuildView {
       if (cause instanceof ActionConflictException) {
         ((ActionConflictException) cause).reportTo(eventHandler);
       }
-      throw new ViewCreationFailedException(errorMsg);
+      if (errorInfo.getException() != null) {
+        throw new ViewCreationFailedException(errorMsg, errorInfo.getException());
+      } else {
+        throw new ViewCreationFailedException(errorMsg);
+      }
     }
 
     boolean hasLoadingError = false;