Fixes oracle#1675 - capture stdout for CL errors

osmanrafiqss · Sep 19, 2019 · 2ec4bb9 · 2ec4bb9
1 parent d6ce8ad
commit 2ec4bb9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java b/...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java
@@ -65,7 +65,7 @@ public Path compileAndParseError(List<String> options, Path source, Path target)
             InputStream is = compilingProcess.getInputStream();
 
             List<String> lines = FileUtils.readAllLines(es);
-            FileUtils.readAllLines(is);
+            List<String> outputLines = FileUtils.readAllLines(is);
             int status = compilingProcess.waitFor();
 
             boolean errorReported = false;
@@ -76,7 +76,11 @@ public Path compileAndParseError(List<String> options, Path source, Path target)
                 }
             }
             if (status != 0 && !errorReported) {
-                reportCompilerError(source, lines.toString());
+                if (Platform.includedIn(Platform.WINDOWS.class)) {
+                    reportCompilerError(source, outputLines.toString());
+                } else {
+                    reportCompilerError(source, lines.toString());
+                }
             }
             compilingProcess.destroy();
             return target;