From e7b75eedc0fd10021c769c08148ac0c7da061d74 Mon Sep 17 00:00:00 2001
From: pojavlauncher <khanhduytran0@users.noreply.github.com>
Date: Wed, 30 Jun 2021 13:39:09 +0700
Subject: [PATCH] zulu port test

---
 buildjdk.sh   | 2 +-
 clonejdk.sh   | 7 ++++---
 macos-host-cc | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/buildjdk.sh b/buildjdk.sh
index 76af323..bde8f97 100755
--- a/buildjdk.sh
+++ b/buildjdk.sh
@@ -40,7 +40,7 @@ if [ "$BUILD_IOS" != "1" ]; then
   ar cru dummy_libs/libthread_db.a
 else
   ln -s -f /opt/X11/include/X11 $ANDROID_INCLUDE/
-  platform_args=--with-toolchain-type=clang
+  platform_args="--with-toolchain-type=clang"
   AUTOCONF_x11arg="--with-x=/opt/X11/include/X11 --disable-precompiled-headers --prefix=/usr/lib"
   sameflags="-arch arm64 -isysroot $thesysroot -miphoneos-version-min=12.0 -DHEADLESS=1 -I$PWD/ios-missing-include -Wno-implicit-function-declaration"
   export CFLAGS+=" $sameflags"
diff --git a/clonejdk.sh b/clonejdk.sh
index d80ec3d..af00eb0 100755
--- a/clonejdk.sh
+++ b/clonejdk.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 set -e
-if [ "$TARGET_JDK" == "arm" ]
-then
+if [ "$TARGET_JDK" == "arm" ]; then
 git clone --depth 1 https://github.com/PojavLauncherTeam/openjdk-aarch32-jdk8u openjdk
+elif [ "$BUILD_IOS" == "1" ]; then
+git clone --depth 1 --branch ios https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u openjdk
 else
-git clone --depth 1 https://github.com/PojavLauncherTeam/openjdk-aarch64-jdk8u openjdk
+git clone --depth 1 https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u openjdk
 fi
diff --git a/macos-host-cc b/macos-host-cc
index 1bd3c6d..36fb77a 100755
--- a/macos-host-cc
+++ b/macos-host-cc
@@ -8,4 +8,4 @@ fi
 args=${args/"-isysroot $thesysroot"/}
 args=${args/"-miphoneos-version-min=12.0"/}
 
-/usr/bin/CC $args --stdlib=libstdc++ -isysroot $themacsysroot
+$thecxx $args --stdlib=libc++ -isysroot $themacsysroot