MACOSX: IPHONE: Use latest LLVM

This fixes the bug we got when optimizing arm64
scummvm · Apr 18, 2022 · 0795b00 · 0795b00
1 parent a3f6e71
commit 0795b00
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py
@@ -414,7 +414,7 @@ def ios7_arm64():
     platform.compatibleBuilds = (builds.ScummVMBuild, )
     platform.configureargs.append("--host=ios7-arm64")
     platform.buildconfigureargs = {
-        builds.ScummVMBuild: [ "--disable-optimizations", "--enable-static", "--with-staticlib-prefix=${PREFIX}"],
+        builds.ScummVMBuild: [ "--enable-static", "--with-staticlib-prefix=${PREFIX}"],
     }
     platform.packaging_cmd = {
         builds.ScummVMBuild: "ios7bundle",
@@ -437,7 +437,7 @@ def macosx_arm64():
 
     platform.configureargs.append("--host=aarch64-apple-darwin21.1")
     platform.buildconfigureargs = {
-        builds.ScummVMBuild: [ "--disable-optimizations", "--enable-static",
+        builds.ScummVMBuild: [ "--enable-static",
             "--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
             "--with-sparkle-prefix=${DESTDIR}/${PREFIX}/Library/Frameworks",
             "--disable-osx-dock-plugin", "--enable-updates"],

diff --git a/toolchains/iphone/Dockerfile.m4 b/toolchains/iphone/Dockerfile.m4
@@ -1,7 +1,7 @@
 FROM toolchains/apple-sdks AS sdks
 
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`IPHONE_SDK_VERSION',15.0)m4_dnl
 m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
 

diff --git a/toolchains/macosx-arm64/Dockerfile.m4 b/toolchains/macosx-arm64/Dockerfile.m4
@@ -1,5 +1,5 @@
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
 m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl

diff --git a/toolchains/macosx-i386/Dockerfile.m4 b/toolchains/macosx-i386/Dockerfile.m4
@@ -1,6 +1,6 @@
 # This worker is used for old i386 only Mac
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
 m4_define(`MACOSX_TARGET_VERSION',17)m4_dnl

diff --git a/toolchains/macosx-x86_64/Dockerfile.m4 b/toolchains/macosx-x86_64/Dockerfile.m4
@@ -1,5 +1,5 @@
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
 m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl

diff --git a/workers/iphone/Dockerfile.m4 b/workers/iphone/Dockerfile.m4
@@ -1,7 +1,7 @@
 FROM toolchains/iphone AS toolchain
 
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`IPHONE_SDK_VERSION',15.0)m4_dnl
 m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
 

diff --git a/workers/macosx-arm64/Dockerfile.m4 b/workers/macosx-arm64/Dockerfile.m4
@@ -1,6 +1,6 @@
 m4_define(`TOOLCHAIN',macosx-arm64)m4_dnl
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
 m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl

diff --git a/workers/macosx-i386/Dockerfile.m4 b/workers/macosx-i386/Dockerfile.m4
@@ -1,7 +1,7 @@
 # This worker is used for old i386 only Mac
 m4_define(`TOOLCHAIN',macosx-i386)m4_dnl
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
 m4_define(`MACOSX_TARGET_VERSION',17)m4_dnl

diff --git a/workers/macosx-x86_64/Dockerfile.m4 b/workers/macosx-x86_64/Dockerfile.m4
@@ -1,6 +1,6 @@
 m4_define(`TOOLCHAIN',macosx-x86_64)m4_dnl
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`PPA_CLANG',-13)m4_dnl
+m4_define(`PPA_CLANG',-14)m4_dnl
 m4_define(`MACOSX_SDK_VERSION',12.0)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
 m4_define(`MACOSX_TARGET_VERSION',21.1)m4_dnl