proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-08-02 21:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

-compiler-rt/compilerrt-fix-warn-xray-testing.diff removed as it seems to be applied upstream

Browse Source
This commit is contained in:
Sylvestre Ledru 2022-11-02 22:28:16 +01:00
parent 32a70e59af
commit 5bc303255e
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
debian/patches/compiler-rt/compilerrt-fix-warn-xray-testing.diff vendored
View File

@ -1,33 +0,0 @@
suppress warnings for xray and testing when not enabled
Index: llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
===================================================================
--- llvm-toolchain-snapshot_16~++20220909084606+06413618eae9.orig/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
+++ llvm-toolchain-snapshot_16~++20220909084606+06413618eae9/compiler-rt/cmake/Modules/CompilerRTUtils.cmake
@@ -324,15 +324,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)
@@ -349,7 +349,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})

1
debian/patches/series vendored
View File

@ -136,7 +136,6 @@ llvm-runtimes-builtins-build-check.diff
issue-54242.diff
# compiler-rt
compiler-rt/compilerrt-fix-warn-xray-testing.diff
compiler-rt/compilerrt-builtins-arch-fix-armhf.diff
compiler-rt/compilerrt-build-scudo-standalone-option.diff