[libcxx] r291991 - Don't dump llvm-config --cmakedir output if command fails.
Eric Fiselier via cfe-commits
cfe-commits at lists.llvm.org
Fri Jan 13 19:35:15 PST 2017
Author: ericwf
Date: Fri Jan 13 21:35:15 2017
New Revision: 291991
URL: http://llvm.org/viewvc/llvm-project?rev=291991&view=rev
Log:
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.
Modified:
libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
Modified: libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake?rev=291991&r1=291990&r2=291991&view=diff
==============================================================================
--- libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake (original)
+++ libcxx/trunk/cmake/Modules/HandleOutOfTreeLLVM.cmake Fri Jan 13 21:35:15 2017
@@ -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()
More information about the cfe-commits
mailing list