From 9e4c91d35f47dfdc38df6551ebe22ca1021abbcc Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Sat, 29 Jan 2022 09:17:38 +0000 Subject: [PATCH] compilerrt-fix-warn-xray-testing suppress warnings for xray and testing when not enabled Gbp-Pq: Name compilerrt-fix-warn-xray-testing.diff --- compiler-rt/cmake/Modules/CompilerRTUtils.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake index f61d487e93..179c74e4df 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -242,15 +242,15 @@ macro(load_llvm_config) # Detect if we have the LLVMXRay and TestingSupport library installed and # available from llvm-config. + set(COMPILER_RT_HAS_LLVMXRAY FALSE) execute_process( COMMAND ${LLVM_CONFIG_PATH} "--ldflags" "--libs" "xray" RESULT_VARIABLE HAD_ERROR OUTPUT_VARIABLE CONFIG_OUTPUT ERROR_QUIET) - if (HAD_ERROR) + if (HAD_ERROR AND COMPILER_RT_BUILD_XRAY) message(WARNING "llvm-config finding xray failed with status ${HAD_ERROR}") - set(COMPILER_RT_HAS_LLVMXRAY FALSE) - else() + elseif(COMPILER_RT_BUILD_XRAY) string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT}) list(GET CONFIG_OUTPUT 0 LDFLAGS) list(GET CONFIG_OUTPUT 1 LIBLIST) @@ -267,7 +267,7 @@ macro(load_llvm_config) RESULT_VARIABLE HAD_ERROR OUTPUT_VARIABLE CONFIG_OUTPUT ERROR_QUIET) - if (HAD_ERROR) + if (HAD_ERROR AND COMPILER_RT_INCLUDE_TESTS) message(WARNING "llvm-config finding testingsupport failed with status ${HAD_ERROR}") elseif(COMPILER_RT_INCLUDE_TESTS) string(REGEX REPLACE "[ \t]*[\r\n]+[ \t]*" ";" CONFIG_OUTPUT ${CONFIG_OUTPUT}) -- 2.30.2