proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-12-25 16:56:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove revert

Browse Source
This commit is contained in:
Sylvestre Ledru 2021-09-24 12:23:14 +02:00
parent 4077379b0f
commit e16e9bcd5a
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
debian/patches/libcxx/libccxx-revert-patch-build.patch vendored
View File

@ -1,42 +0,0 @@
commit 1613ab8a4a3e6f8ab74fadd7e9a2dfe2219e3b43
Author: Nehal J Wani <nehaljw.kkd1@gmail.com>
Date: Thu Sep 16 18:23:53 2021 +0200
[libcxx][libcxxabi] CMAKE_REQUIRED_FLAGS is a string, not a list
When `libcxx` or `libcxxabi` is built with `-DLLVM_USE_SANITIZER=MemoryWithOrigins`
**and** `-DLIBCXX[ABI]_USE_COMPILER_RT=ON`, all of the `LIBCXX[ABI]_SUPPORTS_*_FLAG`
checks fail, since the value of `CMAKE_REQUIRED_FLAGS` is not set correctly.
Bugzilla: https://bugs.llvm.org/show_bug.cgi?id=51774
Reviewed By: #libc, #libc_abi, compnerd, ldionne
Differential Revision: https://reviews.llvm.org/D109342
diff --git b/libcxx/cmake/config-ix.cmake a/libcxx/cmake/config-ix.cmake
index a85e3b8db173..a2f1ff9f1a3b 100644
--- b/libcxx/cmake/config-ix.cmake
+++ a/libcxx/cmake/config-ix.cmake
@@ -48,7 +48,7 @@ if (LIBCXX_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG)
list(APPEND CMAKE_REQUIRED_LIBRARIES c)
endif ()
if (LIBCXX_USE_COMPILER_RT)
- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -rtlib=compiler-rt")
+ list(APPEND CMAKE_REQUIRED_FLAGS -rtlib=compiler-rt)
find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY)
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXX_BUILTINS_LIBRARY}")
elseif (LIBCXX_HAS_GCC_LIB)
diff --git b/libcxxabi/cmake/config-ix.cmake a/libcxxabi/cmake/config-ix.cmake
index 998e25415ed1..7f1cecbcd254 100644
--- b/libcxxabi/cmake/config-ix.cmake
+++ a/libcxxabi/cmake/config-ix.cmake
@@ -38,7 +38,7 @@ if (LIBCXXABI_SUPPORTS_NOSTDLIBXX_FLAG OR LIBCXXABI_SUPPORTS_NODEFAULTLIBS_FLAG)
list(APPEND CMAKE_REQUIRED_LIBRARIES c)
endif ()
if (LIBCXXABI_USE_COMPILER_RT)
- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -rtlib=compiler-rt")
+ list(APPEND CMAKE_REQUIRED_FLAGS -rtlib=compiler-rt)
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}")
else ()

1
debian/patches/series vendored
View File

@ -144,4 +144,3 @@ scan-build-py-fix-default-bin.diff
libclc-llvm-spirv.diff
omp-riscv64.patch
libcxx/libccxx-revert-patch-build.patch