diff options
| -rw-r--r-- | .github/workflows/compat.yaml | 2 | ||||
| -rwxr-xr-x | build_single.sh | 56 | ||||
| -rw-r--r-- | monero_libwallet2_api_c/CMakeLists.txt | 2 |
3 files changed, 34 insertions, 26 deletions
diff --git a/.github/workflows/compat.yaml b/.github/workflows/compat.yaml index 57380e9..3202f89 100644 --- a/.github/workflows/compat.yaml +++ b/.github/workflows/compat.yaml @@ -134,7 +134,7 @@ jobs: steps: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '15.4' + xcode-version: '15.2' - name: Set up Homebrew id: set-up-homebrew uses: Homebrew/actions/setup-homebrew@master diff --git a/build_single.sh b/build_single.sh index 04aef9f..bc0ded2 100755 --- a/build_single.sh +++ b/build_single.sh @@ -59,23 +59,47 @@ case "$HOST_ABI" in ;; "x86_64-linux-android") export PATH="$WDIR/$repo/contrib/depends/${HOST_ABI}/native/bin/:$PATH" - export CC=x86_64-linux-android21-clang - export CXX=x86_64-linux-android21-clang++ + if [[ "$repo" == "wownero" ]]; + then + export CC=x86_64-linux-android-clang + export CXX=x86_64-linux-android-clang++ + else + export CC=x86_64-linux-android21-clang + export CXX=x86_64-linux-android21-clang++ + fi ;; "i686-linux-android") export PATH="$WDIR/$repo/contrib/depends/${HOST_ABI}/native/bin/:$PATH" - export CC=i686-linux-android21-clang - export CXX=i686-linux-android21-clang++ + if [[ "$repo" == "wownero" ]]; + then + export CC=i686-linux-android-clang + export CXX=i686-linux-android-clang++ + else + export CC=i686-linux-android21-clang + export CXX=i686-linux-android21-clang++ + fi ;; "aarch64-linux-android") export PATH="$WDIR/$repo/contrib/depends/${HOST_ABI}/native/bin/:$PATH" - export CC=aarch64-linux-android21-clang - export CXX=aarch64-linux-android21-clang++ + if [[ "$repo" == "wownero" ]]; + then + export CC=aarch64-linux-android-clang + export CXX=aarch64-linux-android-clang++ + else + export CC=aarch64-linux-android21-clang + export CXX=aarch64-linux-android21-clang++ + fi ;; "arm-linux-androideabi") export PATH="$WDIR/$repo/contrib/depends/${HOST_ABI}/native/bin/:$PATH" - export CC=aarch64-linux-android21-clang - export CXX=aarch64-linux-android21-clang++ + if [[ "$repo" == "wownero" ]]; + then + export CC=aarch64-linux-android-clang + export CXX=aarch64-linux-android-clang++ + else + export CC=aarch64-linux-android21-clang + export CXX=aarch64-linux-android21-clang++ + fi ;; "i686-w64-mingw32") update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix @@ -365,26 +389,10 @@ pushd release/$repo rm ${HOST_ABI}_libwinpthread-1.dll.xz || true xz -e ${HOST_ABI}_libwinpthread-1.dll #### - cp /usr/lib/gcc/${HOST_ABI}/*-posix/libstdc++-6.dll ${HOST_ABI}_libstdc++-6.dll - rm ${HOST_ABI}_libstdc++-6.dll.xz || true - xz -e ${HOST_ABI}_libstdc++-6.dll - #### cp /usr/lib/gcc/${HOST_ABI}/*-posix/libssp-0.dll ${HOST_ABI}_libssp-0.dll rm ${HOST_ABI}_libssp-0.dll.xz || true xz -e ${HOST_ABI}_libssp-0.dll fi - if [[ "$HOST_ABI" == "x86_64-w64-mingw32" ]]; - then - cp /usr/lib/gcc/${HOST_ABI}/*-posix/libgcc_s_seh-1.dll ${HOST_ABI}_libgcc_s_seh-1.dll - rm ${HOST_ABI}_libgcc_s_seh-1.dll.xz || true - xz -e ${HOST_ABI}_libgcc_s_seh-1.dll - fi - if [[ "$HOST_ABI" == "i686-w64-mingw32" ]]; - then - cp /usr/lib/gcc/${HOST_ABI}/*-posix/libgcc_s_sjlj-1.dll ${HOST_ABI}_libgcc_s_sjlj-1.dll - rm ${HOST_ABI}_libgcc_s_sjlj-1.dll.xz || true - xz -e ${HOST_ABI}_libgcc_s_sjlj-1.dll - fi if [[ "$HOST_ABI" == "x86_64-linux-android" || "$HOST_ABI" == "i686-linux-android" || "$HOST_ABI" == "aarch64-linux-android" || "$HOST_ABI" == "arm-linux-androideabi" ]]; then cp ../../monero/contrib/depends/${HOST_ABI}/native/sysroot/usr/lib/${HOST_ABI}/libc++_shared.so ${HOST_ABI}_libc++_shared.so diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt index e9691b7..3efca54 100644 --- a/monero_libwallet2_api_c/CMakeLists.txt +++ b/monero_libwallet2_api_c/CMakeLists.txt @@ -336,8 +336,8 @@ endif() if(${HOST_ABI} STREQUAL "x86_64-w64-mingw32" OR ${HOST_ABI} STREQUAL "i686-w64-mingw32") set_target_properties(wallet2_api_c PROPERTIES SUFFIX ".dll") - set(EXTRA_LIBS_WINDOWS ssp wsock32 ws2_32 iconv-win iphlpapi crypt32 hidapi) + target_link_options(wallet2_api_c PRIVATE -static-libgcc -static-libstdc++) endif() if(${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch64-apple-darwin11" OR ${HOST_ABI} STREQUAL "host-apple-darwin" OR ${HOST_ABI} STREQUAL "x86_64-host-apple-darwin" OR ${HOST_ABI} STREQUAL "aarch64-host-apple-darwin" OR ${HOST_ABI} STREQUAL "host-apple-ios") |