summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-03-27 11:38:36 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-03-27 11:39:29 (GMT)
commit2fe8ea555e75c3bd66f285c22bb7be342f5b939f (patch)
tree2b6042f87af7241ff52132f975c61b00f4b9aae0 /Source
parent032df7ae7b60dd347184a32b1ceedf9affed522f (diff)
parentdc93cbb0d8a1f0acb12097d18e7764e856818a7b (diff)
downloadCMake-2fe8ea555e75c3bd66f285c22bb7be342f5b939f.zip
CMake-2fe8ea555e75c3bd66f285c22bb7be342f5b939f.tar.gz
CMake-2fe8ea555e75c3bd66f285c22bb7be342f5b939f.tar.bz2
Merge topic 'llvm-rc-stderr' into release-3.17
dc93cbb0d8 llvm-rc: Print stderr output when calling tools through cmake_llvm_rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4525
Diffstat (limited to 'Source')
-rw-r--r--Source/cmcmd.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 7eeb97f..2bccbc7 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -1697,6 +1697,11 @@ int cmcmd::RunPreprocessor(const std::vector<std::string>& command,
}
auto status = process.GetStatus();
if (!status[0] || status[0]->ExitStatus != 0) {
+ auto errorStream = process.ErrorStream();
+ if (errorStream) {
+ std::cerr << errorStream->rdbuf();
+ }
+
return 1;
}
@@ -1765,6 +1770,10 @@ int cmcmd::RunLLVMRC(std::vector<std::string> const& args)
}
auto status = process.GetStatus();
if (!status[0] || status[0]->ExitStatus != 0) {
+ auto errorStream = process.ErrorStream();
+ if (errorStream) {
+ std::cerr << errorStream->rdbuf();
+ }
return 1;
}