summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2017-01-14 03:35:15 +0000
committerEric Fiselier <eric@efcs.ca>2017-01-14 03:35:15 +0000
commit18cfd4d34570e9c7772e5ec27aaa03385256a2e5 (patch)
treeb330fa279c15157b0a4ec4f0113e625aac2671f4
parent6f24fdb6a01a59c8137923a279d4ecc32079063d (diff)
downloadbcm5719-llvm-18cfd4d34570e9c7772e5ec27aaa03385256a2e5.tar.gz
bcm5719-llvm-18cfd4d34570e9c7772e5ec27aaa03385256a2e5.zip
Don't dump llvm-config --cmakedir output if command fails.
This patch adjusts the out-of-tree CMake configuration so that the stderr output is ignored when an old llvm-config is found that doesn't support --cmakedir. llvm-svn: 291991
-rw-r--r--libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
index 7fee839d273..34dbcb75376 100644
--- a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
+++ b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
@@ -43,7 +43,8 @@ macro(find_llvm_parts)
execute_process(
COMMAND ${LLVM_CONFIG_PATH} --cmakedir
RESULT_VARIABLE HAD_ERROR
- OUTPUT_VARIABLE CONFIG_OUTPUT)
+ OUTPUT_VARIABLE CONFIG_OUTPUT
+ ERROR_QUIET)
if(NOT HAD_ERROR)
string(STRIP "${CONFIG_OUTPUT}" LLVM_CMAKE_PATH)
else()
OpenPOWER on IntegriCloud