Skip to content

Commit 341d86d

Browse files
authored
[CMake] Update CMake cache file for the ARM/Aarch64 cross toolchain builds. NFC. (#103552)
In order to build LLDB project added the following changes: * enable LIBCXX_ENABLE_STATIC_ABI_LIBRARY option to link the ABI library statically. * set LIBCXX_ABI_VERSION to 1 by default.
1 parent 69a0af7 commit 341d86d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

clang/cmake/caches/CrossWinToARMLinux.cmake

+4-2
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ endif()
108108

109109
message(STATUS "Toolchain target to build: ${LLVM_TARGETS_TO_BUILD}")
110110

111-
# Allow to override libc++ ABI version. Use 2 by default.
111+
# Allow to override libc++ ABI version (1 is default).
112112
if (NOT DEFINED LIBCXX_ABI_VERSION)
113-
set(LIBCXX_ABI_VERSION 2)
113+
set(LIBCXX_ABI_VERSION 1)
114114
endif()
115115

116116
message(STATUS "Toolchain's Libc++ ABI version: ${LIBCXX_ABI_VERSION}")
@@ -217,6 +217,8 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_SHARED
217217
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ABI_VERSION ${LIBCXX_ABI_VERSION} CACHE STRING "")
218218
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "") #!!!
219219
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS ON CACHE BOOL "")
220+
# Merge libc++ and libc++abi libraries into the single libc++ library file.
221+
set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "")
220222

221223
# Avoid searching for the python3 interpreter during the runtimes configuration for the cross builds.
222224
# It starts searching the python3 package using the target's sysroot path, that usually is not compatible with the build host.

0 commit comments

Comments
 (0)