From 3eb727598b71e4f6eab4dd2d5b17a31ef432149d Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Tue, 2 Apr 2024 19:14:01 +0200
Subject: [PATCH] actually fix and not workaround the iOS issue.

---
 build_single.sh                                             | 6 +++---
 monero_libwallet2_api_c/CMakeLists.txt                      | 2 +-
 ...006-fix-missing-___clear_cache-when-targetting-iOS.patch | 6 +++---
 ...008-fix-missing-___clear_cache-when-targetting-iOS.patch | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build_single.sh b/build_single.sh
index 3d8d2eb..e050d7a 100755
--- a/build_single.sh
+++ b/build_single.sh
@@ -266,14 +266,14 @@ pushd ${repo}_libwallet2_api_c
     mkdir -p build/${HOST_ABI} -p
     pushd build/${HOST_ABI}
         case $HOST_ABI in
-            "x86_64-linux-gnu" | "i686-linux-gnu" | "aarch64-linux-gnu" | "x86_64-linux-android" | "i686-linux-android" | "aarch64-linux-android" | "arm-linux-androideabi" | "i686-w64-mingw32" | "x86_64-w64-mingw32" | "x86_64-apple-darwin11" | "aarch64-apple-darwin11")
+            "x86_64-linux-gnu" | "i686-linux-gnu" | "aarch64-linux-gnu" | "x86_64-linux-android" | "i686-linux-android" | "aarch64-linux-android" | "arm-linux-androideabi" | "i686-w64-mingw32" | "x86_64-w64-mingw32" | "x86_64-apple-darwin11" | "aarch64-apple-darwin11" | "host-apple-darwin")
                 env CC="${CC}" CXX="${CXX}" cmake -DMONERO_FLAVOR=$repo -DCMAKE_BUILD_TYPE=Debug -DHOST_ABI=${HOST_ABI} ../..
                 CC="${CC}" CXX="${CXX}" make $NPROC
             ;;
             "host-apple-ios")
                 export -n CC CXX
-                cmake -DCMAKE_TOOLCHAIN_FILE=../../../external/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64 -DMONERO_FLAVOR=$repo -DCMAKE_BUILD_TYPE=Debug -DHOST_ABI=${HOST_ABI} ../..
-                make $NPROC
+                CC=clang CXX=clang++ cmake -DCMAKE_TOOLCHAIN_FILE=../../../external/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64 -DMONERO_FLAVOR=$repo -DCMAKE_BUILD_TYPE=Debug -DHOST_ABI=${HOST_ABI} ../..
+                CC=clang CXX=clang++ make $NPROC
             ;;
             *)
                 echo "Unable to build ${repo}_libwallet2_api_c for ${HOST_ABI}"
diff --git a/monero_libwallet2_api_c/CMakeLists.txt b/monero_libwallet2_api_c/CMakeLists.txt
index 896e492..3c3f1d1 100644
--- a/monero_libwallet2_api_c/CMakeLists.txt
+++ b/monero_libwallet2_api_c/CMakeLists.txt
@@ -288,7 +288,7 @@ if (${HOST_ABI} STREQUAL "x86_64-apple-darwin11" OR ${HOST_ABI} STREQUAL "aarch6
 elseif(${HOST_ABI} STREQUAL "host-apple-darwin")
     set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" "-framework Cocoa" apple_nghttp2 event)
 elseif(${HOST_ABI} STREQUAL "host-apple-ios")
-  set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" iconv)
+  set(EXTRA_LIBS_APPLE "-framework IOKit" "-framework CoreFoundation" iconv )
 endif()
 
 # target_compile_options(wallet2_api_c PRIVATE -static-libstdc++)
diff --git a/patches/monero/0006-fix-missing-___clear_cache-when-targetting-iOS.patch b/patches/monero/0006-fix-missing-___clear_cache-when-targetting-iOS.patch
index 0a3be96..bb5149f 100644
--- a/patches/monero/0006-fix-missing-___clear_cache-when-targetting-iOS.patch
+++ b/patches/monero/0006-fix-missing-___clear_cache-when-targetting-iOS.patch
@@ -1,4 +1,4 @@
-From c5bcbae32e07ca57b5df0421bbd392f4926cda97 Mon Sep 17 00:00:00 2001
+From c9c0f36009db6c44ffca13f101854521f8af9919 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Tue, 2 Apr 2024 16:51:56 +0200
 Subject: [PATCH] fix missing ___clear_cache when targetting iOS
@@ -22,12 +22,12 @@ index 73a23fb35..7ea87a009 100644
  	path = external/utf8proc
  	url = https://github.com/JuliaStrings/utf8proc.git
 diff --git a/external/randomx b/external/randomx
-index 102f8acf9..ebb78bdfb 160000
+index 102f8acf9..f045f108e 160000
 --- a/external/randomx
 +++ b/external/randomx
 @@ -1 +1 @@
 -Subproject commit 102f8acf90a7649ada410de5499a7ec62e49e1da
-+Subproject commit ebb78bdfbcd7e6e5214f39688ce8600d5e040ebe
++Subproject commit f045f108e2121abbb6aaeb7ffa5a8d57edb3ebe2
 -- 
 2.44.0
 
diff --git a/patches/wownero/0008-fix-missing-___clear_cache-when-targetting-iOS.patch b/patches/wownero/0008-fix-missing-___clear_cache-when-targetting-iOS.patch
index 899584c..d91bb24 100644
--- a/patches/wownero/0008-fix-missing-___clear_cache-when-targetting-iOS.patch
+++ b/patches/wownero/0008-fix-missing-___clear_cache-when-targetting-iOS.patch
@@ -1,4 +1,4 @@
-From 287f5e9bc0e893f807b8ebd5d1e3707616eded0d Mon Sep 17 00:00:00 2001
+From 216fd03c063d115c8cebd75e7f4ae683977148a8 Mon Sep 17 00:00:00 2001
 From: Czarek Nakamoto <cyjan@mrcyjanek.net>
 Date: Tue, 2 Apr 2024 17:07:19 +0200
 Subject: [PATCH] fix missing ___clear_cache when targetting iOS
@@ -22,12 +22,12 @@ index 86009b6b6..f723bd2d8 100644
 +        branch = cyjan-fix-ios
  
 diff --git a/external/randomwow b/external/randomwow
-index 27b099b6d..03cfddb45 160000
+index 27b099b6d..ce7e4754c 160000
 --- a/external/randomwow
 +++ b/external/randomwow
 @@ -1 +1 @@
 -Subproject commit 27b099b6dd6fef6e17f58c6dfe00009e9c5df587
-+Subproject commit 03cfddb45ba4341b1913c069bcc4f16c2fc6fe71
++Subproject commit ce7e4754c6f28fc9e9b71d0377fb9395e9aa23f4
 -- 
 2.44.0