From 158c14b7a2546cf141054b74043be1f7ffa89762 Mon Sep 17 00:00:00 2001 From: cyan Date: Fri, 28 Jun 2024 12:45:10 +0000 Subject: [PATCH] statically link libc++ --- monero_libwallet2_api_c/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index 9b1e3af..27a9d05 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -336,8 +336,16 @@ endif() if (${HOST_ABI} STREQUAL "x86_64-linux-android" OR ${HOST_ABI} STREQUAL "i686-linux-android" OR - ${HOST_ABI} STREQUAL "aarch64-linux-android" OR - ${HOST_ABI} STREQUAL "armv7a-linux-androideabi") + ${HOST_ABI} STREQUAL "aarch64-linux-android") + add_library(libcppstatic STATIC IMPORTED) + set_target_properties(libcppstatic PROPERTIES IMPORTED_LOCATION + ${MONERO_DIR}/contrib/depends/${HOST_ABI}/native/sysroot/usr/lib/${HOST_ABI}/libc++_static.a) + add_link_options(wallet2_api_c PRIVATE -static-libstdc++) + set(EXTRA_LIBS_ANDROID libcppstatic) +elseif(${HOST_ABI} STREQUAL "armv7a-linux-androideabi") + add_library(libcppstatic STATIC IMPORTED) + set_target_properties(libcppstatic PROPERTIES IMPORTED_LOCATION + ${MONERO_DIR}/contrib/depends/${HOST_ABI}/native/sysroot/usr/lib/arm-linux-androideabi/libc++_static.a) add_link_options(wallet2_api_c PRIVATE -static-libstdc++) endif() @@ -431,4 +439,5 @@ target_link_libraries( wallet2_api_c ${EXTRA_LIBS_WINDOWS} ${EXTRA_LIBS_APPLE} + ${EXTRA_LIBS_ANDROID} )