5 files changed, 12 insertions, 79 deletions
diff --git a/taler-ios-build/README b/taler-ios-build/README
new file mode 100644
index 0000000000..1ade42ef2e
--- /dev/null
+++ b/taler-ios-build/README
@@ -0,0 +1,3 @@
+Node is built with the stub versions of the node code cache and node snapshots
+for ios. Also, v8 is always called with --jitless because jit is not allowed
+by Apple.
diff --git a/taler-ios-build/arm64 b/taler-ios-build/arm64
index 8668039ded..b5c3f87928 100755
--- a/taler-ios-build/arm64
+++ b/taler-ios-build/arm64
@@ -5,20 +5,6 @@ set -eu -o pipefail
 scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 cd $scriptdir
 
-API_LEVEL=21
-BUILD_HOST_TAG='mac-x86_64'
-
-##########
-# Build V8
-##########
-
-./build-ios-v8 arm64
-
-cd $scriptdir/..
-x=$scriptdir/compiled/arm64-v8a/
-mkdir -p $x
-cp deps/v8/out.gn/ios-arm64/obj/*.a $x/
-
 ############
 # Build Node
 ############
@@ -30,6 +16,6 @@ cd $scriptdir
 ./build-ios-node arm64
 
 cd $scriptdir/..
-x=$scriptdir/compiled/arm64-v8a/
+x=$scriptdir/compiled/node-arm64/
 mkdir -p $x
-cp out/Release/libnode.*.dylib $x/
+cp out/Release/*.a $x/
diff --git a/taler-ios-build/build-ios-node b/taler-ios-build/build-ios-node
index 2bf5e71a1e..573ceff867 100755
--- a/taler-ios-build/build-ios-node
+++ b/taler-ios-build/build-ios-node
@@ -8,18 +8,19 @@ set -eu -o pipefail
 scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 cd $scriptdir/..
 
-export GYP_DEFINES="OS=ios clang=1"
+export GYP_DEFINES="target_arch=$DEST_CPU_ARCH host_os=mac target_os=ios"
 
 function myconf() {
   ./configure \
-      --ninja \
       --cross-compiling \
       --dest-cpu=$DEST_CPU_ARCH \
       --dest-os=ios \
       --without-intl \
       --openssl-no-asm \
-      --without-bundled-v8 \
-      --shared
+      --v8-options=--jitless \
+      --enable-static \
+      --without-node-code-cache \
+      --without-node-snapshot
 }
 
 myconf && make
diff --git a/taler-ios-build/build-ios-v8 b/taler-ios-build/build-ios-v8
deleted file mode 100755
index 23471dca12..0000000000
--- a/taler-ios-build/build-ios-v8
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu -o pipefail
-
-scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-cd $scriptdir/..
-
-DEST_CPU_ARCH=$1
-
-# We do not export anything about the tool chain, as v8
-# will pick their own toolchain for android from the ndk
-
-cd ./deps/v8
-
-python3 ./tools/node/fetch_deps.py $PWD
-
-gn_args=$(cat <<EOF
-is_official_build = true
-v8_enable_backtrace = false
-v8_enable_slow_dchecks = true
-v8_optimized_debug = false
-ios_deployment_target = 10
-is_component_build = false
-is_debug = false
-target_cpu = "$DEST_CPU_ARCH"
-target_os = "ios"
-use_custom_libcxx = false
-use_xcode_clang = true
-v8_enable_i18n_support = false
-v8_monolithic = true
-v8_use_external_startup_data = false
-EOF
-)
-
-echo gn_args $gn_args
-
-echo "executing gn gen"
-
-./buildtools/mac/gn gen out.gn/ios-$DEST_CPU_ARCH "--args=$gn_args"
-
-echo "executing ninja"
-
-./_depot_tools/ninja -C out.gn/ios-$DEST_CPU_ARCH v8_monolith d8
diff --git a/taler-ios-build/x64 b/taler-ios-build/x64
index f7d01f2f68..5e5043e167 100755
--- a/taler-ios-build/x64
+++ b/taler-ios-build/x64
@@ -5,20 +5,6 @@ set -eu -o pipefail
 scriptdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 cd $scriptdir
 
-API_LEVEL=21
-BUILD_HOST_TAG='mac-x86_64'
-
-##########
-# Build V8
-##########
-
-./build-ios-v8 x64
-
-cd $scriptdir/..
-x=$scriptdir/compiled/x64-v8a/
-mkdir -p $x
-cp deps/v8/out.gn/ios-x64/*.so $x/
-
 ############
 # Build Node
 ############
@@ -30,6 +16,6 @@ cd $scriptdir
 ./build-ios-node x64
 
 cd $scriptdir/..
-x=$scriptdir/compiled/x64-v8a/
+x=$scriptdir/compiled/node-x64/
 mkdir -p $x
-cp out/Release/libnode.*.dylib $x/
+cp out/Release/*.a $x/