APPLE: Update SDK

Updating SDK implies to update LLVM to version 16 as it fails to build with older versions (commit f4be5ed6a3fef0b2b0c60b29e1c0638926638d28). LLVM version 16 triggers an incompatibility between compiler-rt (which uses C++17 features) and the old i386 MacOS SDK. This new compiler-rt also needs CMake helpers and new arguments to properly build as we wish.
scummvm · Jun 25, 2024 · 2b6a63c · 2b6a63c
1 parent 3df6b4a
commit 2b6a63c
Show file tree

Hide file tree

Showing 26 changed files with 82 additions and 58 deletions.
diff --git a/buildbot-config/platforms.py b/buildbot-config/platforms.py
@@ -417,7 +417,7 @@ def macosx_arm64():
     # configure script doesn't compile discord check with proper flags
     platform.env["DISCORD_LIBS"] = "-framework AppKit"
 
-    platform.configureargs.append("--host=aarch64-apple-darwin22.4")
+    platform.configureargs.append("--host=aarch64-apple-darwin23.6")
     platform.buildconfigureargs = {
         builds.ScummVMBuild: [ "--enable-static",
             "--with-staticlib-prefix=${DESTDIR}/${PREFIX}",
@@ -458,7 +458,7 @@ def macosx_x86_64():
     # configure script doesn't compile discord check with proper flags
     platform.env["DISCORD_LIBS"] = "-framework AppKit"
 
-    platform.configureargs.append("--host=x86_64-apple-darwin22.4")
+    platform.configureargs.append("--host=x86_64-apple-darwin23.6")
     platform.buildconfigureargs = {
         builds.ScummVMBuild: [ "--enable-static",
             "--with-staticlib-prefix=${DESTDIR}/${PREFIX}",

diff --git a/check-versions/config.py b/check-versions/config.py
@@ -33,7 +33,7 @@
 cctools_port_check = {
     'check': 'git commit',
     'repository': 'https://github.com/tpoechtrager/cctools-port.git',
-    'branch': 'master',
+    'branch': '1009.2-ld64-907',
 }
 osxcross_check = {
     'check': 'git commit',

diff --git a/toolchains/apple-common/packages/cctools-port/build.sh b/toolchains/apple-common/packages/cctools-port/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-CCTOOLS_PORT_VERSION=f28fb5e9c31efd3d0552afcce2d2c03cae25c1ca
+CCTOOLS_PORT_VERSION=856d7d1bfcc890357bfe79b3f4aa206a0487b416
 export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)

diff --git a/...e-common/packages/cctools-port/patches/0001-Set-versions-with-environment-variables.patch b/...e-common/packages/cctools-port/patches/0001-Set-versions-with-environment-variables.patch
@@ -1,4 +1,4 @@
-From da4774c38ef4b67e64a5f26544991263c5df0106 Mon Sep 17 00:00:00 2001
+From 70ce92a72b025e73ad493698659236c92c9bfa91 Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Fri, 19 Mar 2021 12:17:45 +0100
 Subject: [PATCH 1/6] Set versions with environment variables
@@ -8,18 +8,18 @@ Subject: [PATCH 1/6] Set versions with environment variables
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/usage_examples/ios_toolchain/build.sh b/usage_examples/ios_toolchain/build.sh
-index be97d2d..19b0479 100755
+index 4c42021..9a772cb 100755
 --- a/usage_examples/ios_toolchain/build.sh
 +++ b/usage_examples/ios_toolchain/build.sh
-@@ -169,7 +169,7 @@ rm -rf tmp
+@@ -184,7 +184,7 @@ echo "*** building ldid ***"
+ echo ""
 
- mkdir -p tmp
  pushd tmp &>/dev/null
 -git_clone_repository https://github.com/tpoechtrager/ldid.git master
 +git_clone_repository https://github.com/tpoechtrager/ldid.git $LDID_VERSION
  pushd ldid &>/dev/null
  make INSTALLPREFIX=$TARGETDIR -j$JOBS install
  popd &>/dev/null
 -- 
-2.32.0
+2.44.2
 
diff --git a/...on/packages/cctools-port/patches/0002-Make-target-directory-and-triple-configurable.patch b/...on/packages/cctools-port/patches/0002-Make-target-directory-and-triple-configurable.patch
@@ -1,4 +1,4 @@
-From ba704854d2e0e63d63e49c8ea796ac11d60b1d53 Mon Sep 17 00:00:00 2001
+From 4a93e0223760bce9adaf082472970b38a271acb9 Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Fri, 19 Mar 2021 12:18:07 +0100
 Subject: [PATCH 2/6] Make target directory and triple configurable
@@ -8,10 +8,10 @@ Subject: [PATCH 2/6] Make target directory and triple configurable
  1 file changed, 4 insertions(+)
 
 diff --git a/usage_examples/ios_toolchain/build.sh b/usage_examples/ios_toolchain/build.sh
-index 19b0479..e405466 100755
+index 9a772cb..f81c114 100755
 --- a/usage_examples/ios_toolchain/build.sh
 +++ b/usage_examples/ios_toolchain/build.sh
-@@ -87,8 +87,12 @@ if [ $# -lt 2 ]; then
+@@ -97,8 +97,12 @@ if [ $# -lt 2 ]; then
      exit 1
  fi
 
@@ -25,5 +25,5 @@ index 19b0479..e405466 100755
 
  if [ -d $TARGETDIR ]; then
 -- 
-2.32.0
+2.44.2
 
diff --git a/...-common/packages/cctools-port/patches/0003-Make-minimum-target-version-configurable.patch b/...-common/packages/cctools-port/patches/0003-Make-minimum-target-version-configurable.patch
@@ -1,4 +1,4 @@
-From 6572edd85dc1b0a15f992a3265e05cd639cd4850 Mon Sep 17 00:00:00 2001
+From 04230f34b5d30c2eb59d53bbdb80560a89725242 Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Fri, 19 Mar 2021 12:18:30 +0100
 Subject: [PATCH 3/6] Make minimum target version configurable
@@ -8,12 +8,12 @@ Subject: [PATCH 3/6] Make minimum target version configurable
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/usage_examples/ios_toolchain/build.sh b/usage_examples/ios_toolchain/build.sh
-index e405466..7d58adf 100755
+index f81c114..0a32a8a 100755
 --- a/usage_examples/ios_toolchain/build.sh
 +++ b/usage_examples/ios_toolchain/build.sh
-@@ -155,10 +155,14 @@ elif ! which dsymutil &>/dev/null; then
-     echo "int main(){return 0;}" | cc -xc -O2 -o $TARGETDIR/bin/dsymutil -
- fi
+@@ -170,10 +170,14 @@ pushd $TARGETDIR/bin &>/dev/null
+ ln -sf $TRIPLE-lipo lipo
+ popd &>/dev/null
 
 +if [ -z "${IPHONEOS_DEPLOYMENT_TARGET}" ]; then
 +	IPHONEOS_DEPLOYMENT_TARGET=$SDK_VERSION
@@ -28,5 +28,5 @@ index e405466..7d58adf 100755
 
  pushd $TARGETDIR/bin &>/dev/null
 -- 
-2.32.0
+2.44.2
 
diff --git a/...on/packages/cctools-port/patches/0004-Fix-ARM-assembler-to-not-emit-invalid-opcodes.patch b/...on/packages/cctools-port/patches/0004-Fix-ARM-assembler-to-not-emit-invalid-opcodes.patch
@@ -1,4 +1,4 @@
-From cf352e594610b74bb02677a1420495defa1146b6 Mon Sep 17 00:00:00 2001
+From 9b0028cc7d688801a4b8fb2fdcbe25ab31b57d6d Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Fri, 19 Mar 2021 12:18:53 +0100
 Subject: [PATCH 4/6] Fix ARM assembler to not emit invalid opcodes
@@ -8,7 +8,7 @@ Subject: [PATCH 4/6] Fix ARM assembler to not emit invalid opcodes
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/cctools/as/arm.c b/cctools/as/arm.c
-index ef856a5..80e7ba7 100644
+index 2f56453..f7dde2b 100644
 --- a/cctools/as/arm.c
 +++ b/cctools/as/arm.c
 @@ -5085,8 +5085,11 @@ static unsigned int
@@ -25,5 +25,5 @@ index ef856a5..80e7ba7 100644
        return a | (i << 7); /* 12-bit pack: [shift-cnt,const].  */
 
 -- 
-2.32.0
+2.44.2
 
diff --git a/...n/packages/cctools-port/patches/0005-Really-silence-linker-arguments-when-compiling.patch b/...n/packages/cctools-port/patches/0005-Really-silence-linker-arguments-when-compiling.patch
@@ -1,4 +1,4 @@
-From 177ceea28d25016752371deb367a465dc839929e Mon Sep 17 00:00:00 2001
+From d39fff999d80b93ff4b809c94cb258b927148c1a Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Sun, 17 Oct 2021 15:38:47 +0200
 Subject: [PATCH 5/6] Really silence linker arguments when compiling
@@ -8,18 +8,18 @@ Subject: [PATCH 5/6] Really silence linker arguments when compiling
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/usage_examples/ios_toolchain/wrapper.c b/usage_examples/ios_toolchain/wrapper.c
-index 57d9dca..e6e46e3 100644
+index 9442319..bc34b26 100644
 --- a/usage_examples/ios_toolchain/wrapper.c
 +++ b/usage_examples/ios_toolchain/wrapper.c
 @@ -182,7 +182,7 @@ int main(int argc, char *argv[])
      args[i++] = osvermin;
-     args[i++] = "-mlinker-version=609";
+     args[i++] = "-mlinker-version=907";
      args[i++] = "-Wl,-adhoc_codesign";
 -    args[i++] = "-Wno-unused-command-line-argument";
 +    args[i++] = "-Qunused-arguments";
 
      for (j = 1; j < argc; ++i, ++j)
          args[i] = argv[j];
 -- 
-2.32.0
+2.44.2
 
diff --git a/...-common/packages/cctools-port/patches/0006-Specify-stdlib-as-recent-LLVM-require-it.patch b/...-common/packages/cctools-port/patches/0006-Specify-stdlib-as-recent-LLVM-require-it.patch
@@ -1,4 +1,4 @@
-From 32c5ec1d6a734c76267f24b6f1fea2d9d539a625 Mon Sep 17 00:00:00 2001
+From c06d48d0bc70d54bfa9d535a2a601714bfd4882f Mon Sep 17 00:00:00 2001
 From: Le Philousophe <lephilousophe@users.noreply.github.com>
 Date: Sat, 13 Nov 2021 17:36:24 +0100
 Subject: [PATCH 6/6] Specify stdlib as recent LLVM require it
@@ -9,10 +9,10 @@ Subject: [PATCH 6/6] Specify stdlib as recent LLVM require it
  2 files changed, 18 insertions(+)
 
 diff --git a/usage_examples/ios_toolchain/build.sh b/usage_examples/ios_toolchain/build.sh
-index 7d58adf..3266b32 100755
+index 0a32a8a..1919e96 100755
 --- a/usage_examples/ios_toolchain/build.sh
 +++ b/usage_examples/ios_toolchain/build.sh
-@@ -221,6 +221,10 @@ echo "int main(){return 0;}" | $TRIPLE-clang -xc -O2 -o test - 1>/dev/null || ex
+@@ -257,6 +257,10 @@ echo "int main(){return 0;}" | $TRIPLE-clang -xc -O2 -o test - 1>/dev/null || ex
  rm test
  echo "OK"
 
@@ -24,7 +24,7 @@ index 7d58adf..3266b32 100755
  echo "*** all done ***"
  echo ""
 diff --git a/usage_examples/ios_toolchain/wrapper.c b/usage_examples/ios_toolchain/wrapper.c
-index e6e46e3..6c30034 100644
+index bc34b26..8145c48 100644
 --- a/usage_examples/ios_toolchain/wrapper.c
 +++ b/usage_examples/ios_toolchain/wrapper.c
 @@ -33,6 +33,15 @@
@@ -56,5 +56,5 @@ index e6e46e3..6c30034 100644
          args[i] = argv[j];
 
 -- 
-2.32.0
+2.44.2
 
diff --git a/toolchains/apple-common/packages/compiler-rt/build.sh b/toolchains/apple-common/packages/compiler-rt/build.sh
@@ -46,6 +46,11 @@ while ! wget --header='Range: bytes=0-0' -O /dev/null \
 	CLANG_VERSION=${CLANG_MAJOR}.${CLANG_MINOR}.${CLANG_PATCH}
 done
 
+# Fetch common CMake modules
+do_http_fetch cmake "https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/cmake-${CLANG_VERSION}.src.tar.xz" 'tar xJf'
+mv "$(pwd)" ../cmake
+cd ..
+
 do_http_fetch compiler-rt "https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz" 'tar xJf'
 
 # We try to support as much versions as we can so fallback on a common ground and fix it
@@ -104,6 +109,8 @@ do_cmake \
 	-DCMAKE_LIPO=$LIPO \
 	-DCMAKE_OSX_SYSROOT="$SDK_DIR" \
 	-DDARWIN_macosx_OVERRIDE_SDK_VERSION=99.99 \
+	-DDARWIN_iphonesimulator_OVERRIDE_SDK_VERSION=99.99 \
+	-DDARWIN_appletvsimulator_OVERRIDE_SDK_VERSION=99.99 \
 	-DDARWIN_${SDK_PLATFORM}_CACHED_SYSROOT="$SDK_DIR" \
 	-DDARWIN_${SDK_PLATFORM}_OVERRIDE_SDK_VERSION="$SDK_VERSION" \
 	-DCOMPILER_RT_ENABLE_TVOS=ON \

diff --git a/toolchains/apple-common/packages/osxcross-clang/build.sh b/toolchains/apple-common/packages/osxcross-clang/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-OSXCROSS_VERSION=ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b
+OSXCROSS_VERSION=b8e6ccbaecd977edf6bb009f08c5c0b3ef72f805
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/apple-common/packages/osxcross/build.sh b/toolchains/apple-common/packages/osxcross/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-OSXCROSS_VERSION=ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b
+OSXCROSS_VERSION=b8e6ccbaecd977edf6bb009f08c5c0b3ef72f805
 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)

diff --git a/toolchains/apple-common/packages/osxcross/patches/0003-Old-SDK-Build-compiler-rt.patch b/toolchains/apple-common/packages/osxcross/patches/0003-Old-SDK-Build-compiler-rt.patch
@@ -0,0 +1,17 @@
+diff --git a/build_compiler_rt.sh b/build_compiler_rt.sh
+index e0b6b91..6c07cf8 100755
+--- a/build_compiler_rt.sh
++++ b/build_compiler_rt.sh
+@@ -172,6 +172,12 @@ if [ $f_res -eq 1 ]; then
+         echo ""
+       fi
+
++      # Disable ORC runtime on older SDK as it requires C++17
++      if [ $(osxcross-cmp $SDK_VERSION "<=" 10.13) -eq 1 ] && \
++	 [ $(osxcross-cmp $CLANG_VERSION ">=" 16.0) -eq 1 ]; then
++         extra_cmake_flags+="-DCOMPILER_RT_BUILD_ORC=OFF "
++      fi
++
+       mkdir $build_dir
+       pushd $build_dir &>/dev/null
+
diff --git a/toolchains/apple-common/packages/sparkle/build.sh b/toolchains/apple-common/packages/sparkle/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-SPARKLE_VERSION=2.6.0
+SPARKLE_VERSION=2.6.3
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..

diff --git a/toolchains/apple-sdks/Dockerfile.m4 b/toolchains/apple-sdks/Dockerfile.m4
@@ -26,7 +26,7 @@ COPY Xcode_`'I386_XCODE_VERSION.xip* ${PACKAGES_LOCATION}
 local_package(xcode-extractor, , PACKAGE=Xcode_`'I386_XCODE_VERSION.xip SDK_PLATFORMS="MacOSX")
 
 # Extract latest MacOS X, AppleTVOS and iPhoneOS SDK
-m4_define(`XCODE_VERSION', 14.3.1)
+m4_define(`XCODE_VERSION', 15.4)
 COPY Xcode_`'XCODE_VERSION.xip* ${PACKAGES_LOCATION}
 local_package(xcode-extractor, , PACKAGE=Xcode_`'XCODE_VERSION.xip SDK_PLATFORMS="MacOSX iPhoneOS AppleTVOS")
 

diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-OSXCROSS_VERSION=ff8d100f3f026b4ffbe4ce96d8aac4ce06f1278b
+OSXCROSS_VERSION=b8e6ccbaecd977edf6bb009f08c5c0b3ef72f805
 export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53
 export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497
 

diff --git a/toolchains/appletv/Dockerfile.m4 b/toolchains/appletv/Dockerfile.m4
@@ -1,6 +1,6 @@
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`XOS_SDK_VERSION',16.4)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`XOS_SDK_VERSION',17.5)m4_dnl
 m4_define(`XOS_DEPLOYMENT_TARGET',9.0)m4_dnl
 
 m4_define(`XOS_SDK_BASE',AppleTVOS)m4_dnl

diff --git a/toolchains/iphone/Dockerfile.m4 b/toolchains/iphone/Dockerfile.m4
@@ -1,6 +1,6 @@
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`XOS_SDK_VERSION',16.4)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`XOS_SDK_VERSION',17.5)m4_dnl
 m4_define(`XOS_DEPLOYMENT_TARGET',7.0)m4_dnl
 
 m4_define(`XOS_SDK_BASE',iPhoneOS)m4_dnl

diff --git a/toolchains/macosx-arm64/Dockerfile.m4 b/toolchains/macosx-arm64/Dockerfile.m4
@@ -1,8 +1,8 @@
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`MACOSX_SDK_VERSION',13.3)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
-m4_define(`MACOSX_TARGET_VERSION',22.4)m4_dnl
+m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl
 m4_define(`MACOSX_DEPLOYMENT_TARGET',12.0)m4_dnl
 m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl
 m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')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(`DEBIAN_CLANG',-14)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)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,8 +1,8 @@
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`MACOSX_SDK_VERSION',13.3)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
-m4_define(`MACOSX_TARGET_VERSION',22.4)m4_dnl
+m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl
 m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
 m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
 m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl

diff --git a/workers/appletv/Dockerfile.m4 b/workers/appletv/Dockerfile.m4
@@ -1,8 +1,8 @@
 FROM toolchains/appletv AS toolchain
 
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`XOS_SDK_VERSION',16.4)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`XOS_SDK_VERSION',17.5)m4_dnl
 m4_define(`XOS_DEPLOYMENT_TARGET',9.0)m4_dnl
 
 m4_define(`XOS_SDK_BASE',AppleTVOS)m4_dnl

diff --git a/workers/iphone/Dockerfile.m4 b/workers/iphone/Dockerfile.m4
@@ -1,8 +1,8 @@
 FROM toolchains/iphone AS toolchain
 
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`XOS_SDK_VERSION',16.4)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`XOS_SDK_VERSION',17.5)m4_dnl
 m4_define(`XOS_DEPLOYMENT_TARGET',7.0)m4_dnl
 
 m4_define(`XOS_SDK_BASE',iPhoneOS)m4_dnl

diff --git a/workers/macosx-arm64/Dockerfile.m4 b/workers/macosx-arm64/Dockerfile.m4
@@ -1,9 +1,9 @@
 m4_define(`TOOLCHAIN',macosx-arm64)m4_dnl
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`MACOSX_SDK_VERSION',13.3)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
-m4_define(`MACOSX_TARGET_VERSION',22.4)m4_dnl
+m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl
 m4_define(`MACOSX_DEPLOYMENT_TARGET',12.0)m4_dnl
 m4_define(`MACOSX_ARCHITECTURES',`arm64')m4_dnl
 m4_define(`MACOSX_PORTS_ARCH_ARG',`--arm64')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(`DEBIAN_CLANG',-14)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)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,9 +1,9 @@
 m4_define(`TOOLCHAIN',macosx-x86_64)m4_dnl
 m4_dnl These settings must be kept in sync between toolchain and worker
-m4_define(`DEBIAN_CLANG',-14)m4_dnl
-m4_define(`MACOSX_SDK_VERSION',13.3)m4_dnl
+m4_define(`DEBIAN_CLANG',-16)m4_dnl
+m4_define(`MACOSX_SDK_VERSION',14.5)m4_dnl
 m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
-m4_define(`MACOSX_TARGET_VERSION',22.4)m4_dnl
+m4_define(`MACOSX_TARGET_VERSION',23.6)m4_dnl
 m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
 m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
 m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl