1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java
index 8bf7a0b112..46c96d80ab 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/CqueryBuildTool.java
@@ -141,10 +141,12 @@ public class CqueryBuildTool extends BuildTool {
                 hostConfiguration)
             : new ThreadSafeOutputFormatterCallback<ConfiguredTarget>() {
               @Override
-              public void processOutput(Iterable<ConfiguredTarget> partialResult)
-                  throws IOException, InterruptedException {
+              public void processOutput(Iterable<ConfiguredTarget> partialResult) {
                 for (ConfiguredTarget configuredTarget : partialResult) {
-                  BuildConfiguration config = configuredTarget.getConfiguration();
+                  BuildConfiguration config =
+                      env.getSkyframeExecutor()
+                          .getConfiguration(
+                              env.getReporter(), configuredTarget.getConfigurationKey());
                   StringBuilder output =
                       new StringBuilder()
                           .append(