@@ -96,7 +96,11 @@ endif()
96
96
if (NOT DEFINED TOOLCHAIN_SHARED_LIBS )
97
97
set (TOOLCHAIN_SHARED_LIBS OFF )
98
98
endif ()
99
-
99
+ # Enable usage of the static libunwind and libc++abi libraries.
100
+ if (NOT DEFINED TOOLCHAIN_USE_STATIC_LIBS )
101
+ set (TOOLCHAIN_USE_STATIC_LIBS ON )
102
+ endif ()
103
+
100
104
if (NOT DEFINED LLVM_TARGETS_TO_BUILD )
101
105
if ("${TOOLCHAIN_TARGET_TRIPLE} " MATCHES "^(armv|arm32)+" )
102
106
set (LLVM_TARGETS_TO_BUILD "ARM" CACHE STRING "" )
@@ -206,7 +210,7 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBUNWIND_USE_COMPILER_RT
206
210
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBUNWIND_ENABLE_SHARED ${TOOLCHAIN_SHARED_LIBS} CACHE BOOL "" )
207
211
208
212
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXXABI_USE_LLVM_UNWINDER ON CACHE BOOL "" )
209
- set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXXABI_ENABLE_STATIC_UNWINDER ON CACHE BOOL "" )
213
+ set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXXABI_ENABLE_STATIC_UNWINDER ${TOOLCHAIN_USE_STATIC_LIBS} CACHE BOOL "" )
210
214
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "" )
211
215
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS OFF CACHE BOOL "" )
212
216
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXXABI_ENABLE_SHARED ${TOOLCHAIN_SHARED_LIBS} CACHE BOOL "" )
@@ -217,7 +221,7 @@ set(RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ABI_VERSION
217
221
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "" ) #!!!
218
222
set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS ON CACHE BOOL "" )
219
223
# Merge libc++ and libc++abi libraries into the single libc++ library file.
220
- set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "" )
224
+ set (RUNTIMES_${TOOLCHAIN_TARGET_TRIPLE}_LIBCXX_ENABLE_STATIC_ABI_LIBRARY ${TOOLCHAIN_USE_STATIC_LIBS} CACHE BOOL "" )
221
225
# Forcely disable the libc++ benchmarks on Windows build hosts
222
226
# (current benchmark test configuration does not support the cross builds there).
223
227
if (WIN32 )
0 commit comments