Update to Xcode 15.0, latest osxcross

godotengine · Sep 25, 2023 · aa1808b · aa1808b
1 parent 2324d9b
commit aa1808b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile.ios b/Dockerfile.ios
@@ -7,7 +7,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
       automake autoconf gcc gcc-c++ gcc-objc gcc-objc++ cmake libicu-devel libtool libxml2-devel openssl-devel perl python yasm && \
     git clone --progress https://github.com/tpoechtrager/cctools-port && \
     cd /root/cctools-port && \
-    git checkout f28fb5e9c31efd3d0552afcce2d2c03cae25c1ca && \
+    git checkout 437ced391dbf14dce86f977ca050a750d5682f39 && \
     curl -LO https://github.com/tpoechtrager/cctools-port/pull/136.patch && \
     git apply 136.patch && \
     # arm64 device

diff --git a/Dockerfile.osx b/Dockerfile.osx
@@ -6,13 +6,13 @@ RUN dnf -y install --setopt=install_weak_deps=False \
       libxml2-devel openssl-devel uuid-devel yasm && \
     git clone --progress https://github.com/tpoechtrager/osxcross && \
     cd /root/osxcross && \
-    git checkout 27499bce6f512bf5ed81fff81ed5db800b9c7cb7 && \
-    ln -s /root/files/MacOSX13.3.sdk.tar.xz /root/osxcross/tarballs && \
+    git checkout 5e1b71fcceb23952f3229995edca1b6231525b5b && \
+    ln -s /root/files/MacOSX14.0.sdk.tar.xz /root/osxcross/tarballs && \
     export UNATTENDED=1 && \
     # Custom build Apple Clang to ensure compatibility.
     # Find the equivalent LLVM version for the SDK from:
     # https://en.wikipedia.org/wiki/Xcode#Toolchain_versions
-    CLANG_VERSION=15.0.0 ENABLE_CLANG_INSTALL=1 INSTALLPREFIX=/usr ./build_apple_clang.sh && \
+    CLANG_VERSION=16.0.0 ENABLE_CLANG_INSTALL=1 INSTALLPREFIX=/usr ./build_apple_clang.sh && \
     ./build.sh && \
     ./build_compiler_rt.sh && \
     rm -rf /root/osxcross/build

diff --git a/README.md b/README.md
@@ -87,5 +87,5 @@ These are the toolchains currently in use for Godot 4.2 and later:
 - Windows: MinGW 10.0.0, GCC 12.2.1, binutils 2.39
 - Web: Emscripten 3.1.45
 - Android: Android NDK 25.2.9519653, build-tools 34.0.0, platform android-34, CMake 3.22.1
-- macOS: Xcode 14.3.1 with Apple Clang (LLVM 15.0.0), MacOSX SDK 13.3
-- iOS: Xcode 14.3.1 with Apple Clang (LLVM 15.0.0), iPhoneOS SDK 16.4
+- macOS: Xcode 15.0 with Apple Clang (LLVM 16.0.0), MacOSX SDK 14.0
+- iOS: Xcode 15.0 with Apple Clang (LLVM 16.0.0), iPhoneOS SDK 17.0
diff --git a/build.sh b/build.sh
@@ -58,9 +58,9 @@ podman_build windows
 podman_build web
 podman_build android
 
-XCODE_SDK=14.3.1
-OSX_SDK=13.3
-IOS_SDK=16.4
+XCODE_SDK=15
+OSX_SDK=14.0
+IOS_SDK=17.0
 if [ ! -e "${files_root}"/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e "${files_root}"/iPhoneOS${IOS_SDK}.sdk.tar.xz ] || [ ! -e "${files_root}"/iPhoneSimulator${IOS_SDK}.sdk.tar.xz ]; then
   if [ ! -e "${files_root}"/Xcode_${XCODE_SDK}.xip ]; then
     echo "files/Xcode_${XCODE_SDK}.xip is required. It can be downloaded from https://developer.apple.com/download/more/ with a valid apple ID."