ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-05-21 05:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MACOS: Switch back to Debian LLVM as it's modern enough now

Browse Source 
iOS still needs something too recent for Debian
This commit is contained in:
Le Philousophe
2021-10-17 14:34:21 +00:00
parent f44dc887ef
commit 2514a79a51
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchains/macosx-arm64/Dockerfile.m4
+2 -2
View File
@@ -1,5 +1,5 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`DEBIAN_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.3)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',aarch64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.4)m4_dnl
@@ -13,5 +13,5 @@ m4_include(`macosx.m4')m4_dnl
helpers_package(discord-rpc, -DCMAKE_SYSTEM_NAME=Darwin)
# This package isn't available for i386 so put it here
# It's in macosx-common for any ARM toolchain
# It's in macosx-common for any MacOS toolchain
common_package(sparkle)
toolchains/macosx-i386/Dockerfile.m4
+1 -1
View File
@@ -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',-11)m4_dnl
m4_define(`DEBIAN_CLANG',-11)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
toolchains/macosx-x86_64/Dockerfile.m4
+2 -2
View File
@@ -1,5 +1,5 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`DEBIAN_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.3)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20.4)m4_dnl
@@ -13,5 +13,5 @@ m4_include(`macosx.m4')m4_dnl
helpers_package(discord-rpc, -DCMAKE_SYSTEM_NAME=Darwin)
# This package isn't available for i386 so put it here
# It's in macosx-common for any ARM toolchain
# It's in macosx-common for any MacOS toolchain
common_package(sparkle)