thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

1. skip extract darwin toolchain in builder when uncessary

Browse Source 
2. update MacOSX SDK version in toolchain readme to match in builder
This commit is contained in:
cmsxbc 2023-06-04 23:06:21 +08:00
parent b8f9a57797
commit 4bb44c7c72
No known key found for this signature in database
GPG Key ID: A58268D081411C9C
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/toolchain/darwin-x86_64/README.txt
View File

@ -1,2 +1,2 @@
wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.15.sdk.tar.xz wget https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.0.sdk.tar.xz
tar xJf MacOSX10.15.sdk.tar.xz --strip-components=1 tar xJf MacOSX11.0.sdk.tar.xz --strip-components=1

8
docker/packager/binary/build.sh
View File

@ -11,9 +11,11 @@ ccache_status () {
[ -O /build ] || git config --global --add safe.directory /build [ -O /build ] || git config --global --add safe.directory /build
mkdir -p /build/cmake/toolchain/darwin-x86_64 if [ "$EXTRACT_TOOLCHAIN_DARWIN" = "1" ];then
tar xJf /MacOSX11.0.sdk.tar.xz -C /build/cmake/toolchain/darwin-x86_64 --strip-components=1 mkdir -p /build/cmake/toolchain/darwin-x86_64
ln -sf darwin-x86_64 /build/cmake/toolchain/darwin-aarch64 tar xJf /MacOSX11.0.sdk.tar.xz -C /build/cmake/toolchain/darwin-x86_64 --strip-components=1
ln -sf darwin-x86_64 /build/cmake/toolchain/darwin-aarch64
fi
# Uncomment to debug ccache. Don't put ccache log in /output right away, or it # Uncomment to debug ccache. Don't put ccache log in /output right away, or it
# will be confusingly packed into the "performance" package. # will be confusingly packed into the "performance" package.

2
docker/packager/packager
View File

@ -167,6 +167,7 @@ def parse_env_variables(
cmake_flags.append( cmake_flags.append(
"-DCMAKE_TOOLCHAIN_FILE=/build/cmake/darwin/toolchain-x86_64.cmake" "-DCMAKE_TOOLCHAIN_FILE=/build/cmake/darwin/toolchain-x86_64.cmake"
) )
result.append("EXTRACT_TOOLCHAIN_DARWIN=1")
elif is_cross_darwin_arm: elif is_cross_darwin_arm:
cc = compiler[: -len(DARWIN_ARM_SUFFIX)] cc = compiler[: -len(DARWIN_ARM_SUFFIX)]
cmake_flags.append("-DCMAKE_AR:FILEPATH=/cctools/bin/aarch64-apple-darwin-ar") cmake_flags.append("-DCMAKE_AR:FILEPATH=/cctools/bin/aarch64-apple-darwin-ar")
@ -181,6 +182,7 @@ def parse_env_variables(
cmake_flags.append( cmake_flags.append(
"-DCMAKE_TOOLCHAIN_FILE=/build/cmake/darwin/toolchain-aarch64.cmake" "-DCMAKE_TOOLCHAIN_FILE=/build/cmake/darwin/toolchain-aarch64.cmake"
) )
result.append("EXTRACT_TOOLCHAIN_DARWIN=1")
elif is_cross_arm: elif is_cross_arm:
cc = compiler[: -len(ARM_SUFFIX)] cc = compiler[: -len(ARM_SUFFIX)]
cmake_flags.append( cmake_flags.append(