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

MACOSX/IPHONE: Upgrade to LLVM 11

Browse Source 
For iPhone where we need compiler-rt, try several patch versions when
the compiler one is not available (CLang PPA is development build)

Upgrade cctools-port at the same time.
This commit is contained in:
Le Philousophe
2020-12-20 09:49:38 +00:00
parent cf9c01ade2
commit 0e5114572d
8 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchains/iphone/Dockerfile.m4
+1 -1
View File
@@ -2,7 +2,7 @@ FROM toolchains/common AS helpers
FROM toolchains/apple-sdks AS sdks
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`IPHONE_SDK_VERSION',14.3)m4_dnl
m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
toolchains/iphone/packages/compiler-rt/build.sh
+14 -3
View File
@@ -22,12 +22,23 @@ CLANG_INCLUDE_DIR="${CLANG_LIB_DIR}/include"
CLANG_DARWIN_LIB_DIR="${CLANG_LIB_DIR}/lib/darwin"
# Don't support below 4.x and master to simplify
CLANG_MAJOR=${CLANG_VERSION%%.*}
BRANCH=release/$CLANG_MAJOR.x
#CLANG_MAJOR=${CLANG_VERSION%%.*}
#BRANCH=release/$CLANG_MAJOR.x
#do_git_fetch llvm-project "https://github.com/llvm/llvm-project.git" "${BRANCH}"
#cd compiler-rt
CLANG_PATCH=${CLANG_VERSION##*.}
CLANG_MAJMIN=${CLANG_VERSION%.*}
# --spider doesn't work with Github/AWS so just do a 1 byte download to /dev/null
while ! wget --header='Range: bytes=0-0' -O /dev/null \
"https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz"; do
if [ "$CLANG_PATCH" -eq 0 ]; then
exit 1
fi
CLANG_PATCH=$(($CLANG_PATCH - 1))
CLANG_VERSION=${CLANG_MAJMIN}.${CLANG_PATCH}
done
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
toolchains/iphone/packages/toolchain/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
CCTOOLS_PORT_VERSION=634a084377ee2e2932c66459b0396edf76da2e9f
CCTOOLS_PORT_VERSION=30518813875aed656aa7f18b6d485feee25f8f87
export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
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',-10)m4_dnl
m4_define(`PPA_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/Dockerfile.m4
+1 -1
View File
@@ -1,5 +1,5 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21)m4_dnl
workers/iphone/Dockerfile.m4
+1 -1
View File
@@ -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',-10)m4_dnl
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`IPHONE_SDK_VERSION',14.3)m4_dnl
m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
workers/macosx-i386/Dockerfile.m4
+1 -1
View File
@@ -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',-10)m4_dnl
m4_define(`PPA_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
workers/macosx/Dockerfile.m4
+1 -1
View File
@@ -1,6 +1,6 @@
m4_define(`TOOLCHAIN',macosx)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`PPA_CLANG',-11)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21)m4_dnl