azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add initial support for macos_arm64 host

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-03-19 20:07:02 +07:00
committed by TeamCityServer
parent 4222fb9629
commit 7e18b69e7d
4 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/konan/konan.properties
+26 -1
View File
@@ -38,7 +38,8 @@ reducedLlvmAppendix = compact
predefinedLlvmDistributions = \
clang-llvm-8.0.0-linux-x86-64 \
msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
clang-llvm-apple-8.0.0-darwin-macos
clang-llvm-apple-8.0.0-darwin-macos \
clang-llvm-apple-8.0.0-darwin-macos-aarch64
llvm.linux_x64.dev = clang-llvm-8.0.0-linux-x86-64
llvm.linux_x64.user = clang-llvm-8.0.0-linux-x86-64
@@ -49,6 +50,9 @@ llvm.mingw_x64.user = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
llvm.macos_x64.dev = clang-llvm-apple-8.0.0-darwin-macos
llvm.macos_x64.user = clang-llvm-apple-8.0.0-darwin-macos
llvm.macos_arm64.dev = clang-llvm-apple-8.0.0-darwin-macos-aarch64
llvm.macos_arm64.user = clang-llvm-apple-8.0.0-darwin-macos-aarch64
# By default LLVM uses 250 for -03 builds.
# We use a smaller value since default value leads to
# unreasonably bloated runtime code without any measurable
@@ -62,6 +66,7 @@ linkerGccFlags = -lgcc --as-needed -lgcc_s --no-as-needed -lc -lgcc --as-needed
llvmVersion.linux_x64 = 8.0.0
llvmVersion.mingw_x64 = 8.0.1
llvmVersion.macos_x64 = 8.0.0
llvmVersion.macos_arm64 = 8.0.0
cacheableTargets.macos_x64 = \
macos_x64 \
@@ -73,6 +78,8 @@ cacheableTargets.linux_x64 = \
cacheableTargets.mingw_x64 =
cacheableTargets.macos_arm64 =
# Mac OS X.
# Can be an absolute path instead of predefined value.
llvmHome.macos_x64 = $llvm.macos_x64.dev
@@ -113,6 +120,11 @@ xcode-addon-xcode_12_2-macos_x64.default = \
remote:internal
# macOS Apple Silicon
llvmHome.macos_arm64 = $llvm.macos_arm64.dev
targetToolchain.macos_arm64 = target-toolchain-xcode_12_2-macos_x64
libffiDir.macos_arm64 = libffi-3.3-1-macos-arm64
additionalToolsDir.macos_arm64 = xcode-addon-xcode_12_2-macos_x64
targetToolchain.macos_x64-macos_arm64 = target-toolchain-xcode_12_2-macos_x64
arch.macos_arm64 = arm64
targetSysRoot.macos_arm64 = target-sysroot-xcode_12_2-macos_x64
@@ -136,12 +148,21 @@ osVersionMinFlagClang.macos_arm64 = -mmacosx-version-min
osVersionMin.macos_arm64 = 11.0
runtimeDefinitions.macos_arm64 = KONAN_OSX=1 KONAN_MACOSX=1 KONAN_ARM64=1 KONAN_OBJC_INTEROP=1 \
KONAN_CORE_SYMBOLICATION=1
dependencies.macos_arm64 = \
libffi-3.3-1-macos-arm64
dependencies.macos_x64-macos_arm64 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_12_2-macos_arm64.default = \
remote:internal
target-toolchain-xcode_12_2-macos_arm64.default = \
remote:internal
xcode-addon-xcode_12_2-macos_arm64.default = \
remote:internal
# Apple's 32-bit iOS.
targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_12_2-macos_x64
dependencies.macos_x64-ios_arm32 = \
@@ -180,6 +201,10 @@ targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_12_2-macos_x64
dependencies.macos_x64-ios_arm64 = \
libffi-3.2.1-3-darwin-macos
targetToolchain.macos_arm64-ios_arm64 = target-toolchain-xcode_12_2-macos_x64
dependencies.macos_arm64-ios_arm64 = \
libffi-3.3-1-macos-arm64
target-sysroot-xcode_12_2-ios_arm64.default = \
remote:internal