diff options
| author | Petr Hosek <phosek@chromium.org> | 2019-02-12 01:09:07 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2019-02-12 01:09:07 +0000 |
| commit | 47de76b0d42dcb95db85571ab26b93634979276e (patch) | |
| tree | 34f203c123eefa70f54acc4d8a50d3baba0a5c3b /compiler-rt/cmake/Modules | |
| parent | 6e31f4758f76f0d6d5d0d0aa166a9f8fe96af5c0 (diff) | |
| download | bcm5719-llvm-47de76b0d42dcb95db85571ab26b93634979276e.tar.gz bcm5719-llvm-47de76b0d42dcb95db85571ab26b93634979276e.zip | |
[CMake][XRay] Silence llvm-config error when checking library support
Otherwise this propagates all the way to CMake and results in an error
during configuration. We check and handle the result and report warning
separately so this is not changing the behavior.
Differential Revision: https://reviews.llvm.org/D58086
llvm-svn: 353784
Diffstat (limited to 'compiler-rt/cmake/Modules')
| -rw-r--r-- | compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake index 5348f2064b6..3ebd9273949 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -233,7 +233,8 @@ macro(load_llvm_config) execute_process( COMMAND ${LLVM_CONFIG_PATH} "--ldflags" "--libs" "xray" RESULT_VARIABLE HAD_ERROR - OUTPUT_VARIABLE CONFIG_OUTPUT) + OUTPUT_VARIABLE CONFIG_OUTPUT + ERROR_QUIET) if (HAD_ERROR) message(WARNING "llvm-config finding xray failed with status ${HAD_ERROR}") set(COMPILER_RT_HAS_LLVMXRAY FALSE) @@ -250,7 +251,8 @@ macro(load_llvm_config) execute_process( COMMAND ${LLVM_CONFIG_PATH} "--ldflags" "--libs" "testingsupport" RESULT_VARIABLE HAD_ERROR - OUTPUT_VARIABLE CONFIG_OUTPUT) + OUTPUT_VARIABLE CONFIG_OUTPUT + ERROR_QUIET) if (HAD_ERROR) message(WARNING "llvm-config finding testingsupport failed with status ${HAD_ERROR}") else() |
