summaryrefslogtreecommitdiff
path: root/libcxxabi/cmake
diff options
context:
space:
mode:
authorNehal J Wani <nehaljw.kkd1@gmail.com>2021-09-16 18:23:53 +0200
committerMark de Wever <koraq@xs4all.nl>2021-09-16 18:26:29 +0200
commit1613ab8a4a3e6f8ab74fadd7e9a2dfe2219e3b43 (patch)
tree07d55e815d0602326e1a9c706410562e09716611 /libcxxabi/cmake
parent003fed8269b3f6d2b1618b670fc73d28972999e4 (diff)
downloadllvm-1613ab8a4a3e6f8ab74fadd7e9a2dfe2219e3b43.tar.gz
[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
Diffstat (limited to 'libcxxabi/cmake')
-rw-r--r--libcxxabi/cmake/config-ix.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/cmake/config-ix.cmake b/libcxxabi/cmake/config-ix.cmake
index 7f1cecbcd254..998e25415ed1 100644
--- a/libcxxabi/cmake/config-ix.cmake
+++ b/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)
- list(APPEND CMAKE_REQUIRED_FLAGS -rtlib=compiler-rt)
+ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -rtlib=compiler-rt")
find_compiler_rt_library(builtins LIBCXXABI_BUILTINS_LIBRARY)
list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXXABI_BUILTINS_LIBRARY}")
else ()