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

[Xcode 12] Update konan.properties and tarballs version

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-09-25 16:57:00 +07:00
committed by Sergey Bogolepov
parent 158e5797cb
commit ab0f7e84ea
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/konan.properties
+39 -39
View File
@@ -57,12 +57,12 @@ llvmVersion.macos_x64 = 8.0.0
# Mac OS X.
# Can be an absolute path instead of predefined value.
llvmHome.macos_x64 = $llvm.macos_x64.dev
targetToolchain.macos_x64 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64 = target-toolchain-xcode_12_0-macos_x64
libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos
additionalToolsDir.macos_x64 = xcode-addon-xcode_11_5-macos_x64
additionalToolsDir.macos_x64 = xcode-addon-xcode_12_0-macos_x64
arch.macos_x64 = x86_64
targetSysRoot.macos_x64 = target-sysroot-xcode_11_5-macos_x64
targetSysRoot.macos_x64 = target-sysroot-xcode_12_0-macos_x64
clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
clangNooptFlags.macos_x64 = -O1
@@ -70,7 +70,7 @@ clangOptFlags.macos_x64 = -O3
clangDebugFlags.macos_x64 = -O0
clangDynamicFlags.macos_x64 =
linkerKonanFlags.macos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 10.15.4
linkerKonanFlags.macos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 10.15.6
linkerOptimizationFlags.macos_x64 = -dead_strip
linkerNoDebugFlags.macos_x64 = -S
linkerDynamicFlags.macos_x64 = -dylib
@@ -82,27 +82,27 @@ dependencies.macos_x64 = \
libffi-3.2.1-3-darwin-macos \
lldb-3-macos
target-sysroot-xcode_11_5-macos_x64.default = \
target-sysroot-xcode_12_0-macos_x64.default = \
remote:internal
target-toolchain-xcode_11_5-macos_x64.default = \
target-toolchain-xcode_12_0-macos_x64.default = \
remote:internal
xcode-addon-xcode_11_5-macos_x64.default = \
xcode-addon-xcode_12_0-macos_x64.default = \
remote:internal
# Apple's 32-bit iOS.
targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-ios_arm32 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-ios_arm32.default = \
target-sysroot-xcode_12_0-ios_arm32.default = \
remote:internal
arch.ios_arm32 = armv7
# Shared with 64-bit version.
targetSysRoot.ios_arm32 = target-sysroot-xcode_11_5-ios_arm64
targetSysRoot.ios_arm32 = target-sysroot-xcode_12_0-ios_arm64
clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir
clangNooptFlags.ios_arm32 = -O1
@@ -111,22 +111,22 @@ clangDebugFlags.ios_arm32 = -O0
clangDynamicFlags.ios_arm32 =
linkerNoDebugFlags.ios_arm32 = -S
linkerDynamicFlags.ios_arm32 = -dylib
linkerKonanFlags.ios_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.5
linkerKonanFlags.ios_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 14.0
linkerOptimizationFlags.ios_arm32 = -dead_strip
osVersionMinFlagLd.ios_arm32 = -iphoneos_version_min
osVersionMinFlagClang.ios_arm32 = -miphoneos-version-min
osVersionMin.ios_arm32 = 9.0
# Apple's 64-bit iOS.
targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-ios_arm64 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-ios_arm64.default = \
target-sysroot-xcode_12_0-ios_arm64.default = \
remote:internal
arch.ios_arm64 = arm64
targetSysRoot.ios_arm64 = target-sysroot-xcode_11_5-ios_arm64
targetSysRoot.ios_arm64 = target-sysroot-xcode_12_0-ios_arm64
clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
clangNooptFlags.ios_arm64 = -O1
@@ -139,22 +139,22 @@ clangDynamicFlags.ios_arm64 =
linkerNoDebugFlags.ios_arm64 = -S
linkerDynamicFlags.ios_arm64 = -dylib
linkerKonanFlags.ios_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.5
linkerKonanFlags.ios_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 14.0
linkerOptimizationFlags.ios_arm64 = -dead_strip
osVersionMinFlagLd.ios_arm64 = -iphoneos_version_min
osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
osVersionMin.ios_arm64 = 9.0
# Apple's iOS simulator.
targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-ios_x64 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-ios_x64.default = \
target-sysroot-xcode_12_0-ios_x64.default = \
remote:internal
arch.ios_x64 = x86_64
targetSysRoot.ios_x64 = target-sysroot-xcode_11_5-ios_x64
targetSysRoot.ios_x64 = target-sysroot-xcode_12_0-ios_x64
clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
clangNooptFlags.ios_x64 = -O1
@@ -162,7 +162,7 @@ clangOptFlags.ios_x64 = -O3
clangDebugFlags.ios_x64 = -O0
clangDynamicFlags.ios_x64 =
linkerKonanFlags.ios_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.5
linkerKonanFlags.ios_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 14.0
linkerOptimizationFlags.ios_x64 = -dead_strip
linkerNoDebugFlags.ios_x64 = -S
linkerDynamicFlags.ios_x64 = -dylib
@@ -171,15 +171,15 @@ osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min
osVersionMin.ios_x64 = 9.0
# Apple's tvOS simulator.
targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-tvos_x64 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-tvos_x64.default = \
target-sysroot-xcode_12_0-tvos_x64.default = \
remote:internal
arch.tvos_x64 = x86_64
targetSysRoot.tvos_x64 = target-sysroot-xcode_11_5-tvos_x64
targetSysRoot.tvos_x64 = target-sysroot-xcode_12_0-tvos_x64
clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
clangNooptFlags.tvos_x64 = -O1
@@ -187,7 +187,7 @@ clangOptFlags.tvos_x64 = -O3
clangDebugFlags.tvos_x64 = -O0
clangDynamicFlags.tvos_x64 =
linkerKonanFlags.tvos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
linkerKonanFlags.tvos_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 14.0
linkerOptimizationFlags.tvos_x64 = -dead_strip
linkerNoDebugFlags.tvos_x64 = -S
linkerDynamicFlags.tvos_x64 = -dylib
@@ -196,15 +196,15 @@ osVersionMinFlagClang.tvos_x64 = -mtvos-simulator-version-min
osVersionMin.tvos_x64 = 9.0
# Apple's 64-bit tvOS.
targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-tvos_arm64 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-tvos_arm64.default = \
target-sysroot-xcode_12_0-tvos_arm64.default = \
remote:internal
arch.tvos_arm64 = arm64
targetSysRoot.tvos_arm64 = target-sysroot-xcode_11_5-tvos_arm64
targetSysRoot.tvos_arm64 = target-sysroot-xcode_12_0-tvos_arm64
clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
clangNooptFlags.tvos_arm64 = -O1
@@ -214,22 +214,22 @@ clangDynamicFlags.tvos_arm64 =
linkerNoDebugFlags.tvos_arm64 = -S
linkerDynamicFlags.tvos_arm64 = -dylib
linkerKonanFlags.tvos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4
linkerKonanFlags.tvos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 14.0
linkerOptimizationFlags.tvos_arm64 = -dead_strip
osVersionMinFlagLd.tvos_arm64 = -tvos_version_min
osVersionMinFlagClang.tvos_arm64 = -mtvos-version-min
osVersionMin.tvos_arm64 = 9.0
# watchOS armv7k
targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-watchos_arm32 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-watchos_arm32.default = \
target-sysroot-xcode_12_0-watchos_arm32.default = \
remote:internal
arch.watchos_arm32 = armv7k
targetSysRoot.watchos_arm32 = target-sysroot-xcode_11_5-watchos_arm32
targetSysRoot.watchos_arm32 = target-sysroot-xcode_12_0-watchos_arm32
clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir
clangNooptFlags.watchos_arm32 = -O1
@@ -237,7 +237,7 @@ clangOptFlags.watchos_arm32 = -O3
clangDebugFlags.watchos_arm32 = -O0
clangDynamicFlags.watchos_arm32 =
linkerKonanFlags.watchos_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.2
linkerKonanFlags.watchos_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 7.0
linkerOptimizationFlags.watchos_arm32 = -dead_strip
linkerNoDebugFlags.watchos_arm32 = -S
linkerDynamicFlags.watchos_arm32 = -dylib
@@ -246,15 +246,15 @@ osVersionMinFlagClang.watchos_arm32 = -mwatchos-version-min
osVersionMin.watchos_arm32 = 5.0
# watchOS arm64_32
targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-watchos_arm64 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-watchos_arm64.default = \
target-sysroot-xcode_12_0-watchos_arm64.default = \
remote:internal
arch.watchos_arm64 = arm64_32
targetSysRoot.watchos_arm64 = target-sysroot-xcode_11_5-watchos_arm32
targetSysRoot.watchos_arm64 = target-sysroot-xcode_12_0-watchos_arm32
clangFlags.watchos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -mllvm -aarch64-watch-bitcode-compatibility \
-mllvm -arm-bitcode-compatibility -mllvm -fast-isel=false -mllvm -global-isel=false
@@ -263,7 +263,7 @@ clangOptFlags.watchos_arm64 = -O3
clangDebugFlags.watchos_arm64 = -O0
clangDynamicFlags.watchos_arm64 =
linkerKonanFlags.watchos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.2
linkerKonanFlags.watchos_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 7.0
linkerOptimizationFlags.watchos_arm64 = -dead_strip
linkerNoDebugFlags.watchos_arm64 = -S
linkerDynamicFlags.watchos_arm64 = -dylib
@@ -272,15 +272,15 @@ osVersionMinFlagClang.watchos_arm64 = -mwatchos-version-min
osVersionMin.watchos_arm64 = 5.0
# Apple's watchOS i386 simulator.
targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_11_5-macos_x64
targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_12_0-macos_x64
dependencies.macos_x64-watchos_x86 = \
libffi-3.2.1-3-darwin-macos
target-sysroot-xcode_11_5-watchos_x86.default = \
target-sysroot-xcode_12_0-watchos_x86.default = \
remote:internal
arch.watchos_x86 = i386
targetSysRoot.watchos_x86 = target-sysroot-xcode_11_5-watchos_x86
targetSysRoot.watchos_x86 = target-sysroot-xcode_12_0-watchos_x86
# -target-cpu pentium4 makes sure that cogenerator knows which CPU flavour to emit code for.
# Can be seen on optimized build and FP tests, where value is passed on stack
@@ -292,7 +292,7 @@ clangOptFlags.watchos_x86 = -O3
clangDebugFlags.watchos_x86 = -O0
clangDynamicFlags.watchos_x86 =
linkerKonanFlags.watchos_x86 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 6.2
linkerKonanFlags.watchos_x86 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 7.0
linkerOptimizationFlags.watchos_x86 = -dead_strip
linkerNoDebugFlags.watchos_x86 = -S
linkerDynamicFlags.watchos_x86 = -dylib
tools/scripts/update_xcode.sh
+1 -1
View File
@@ -2,7 +2,7 @@
set -e
# "brew install coreutils" for grealpath.
KONAN_TOOLCHAIN_VERSION=xcode_11_5
KONAN_TOOLCHAIN_VERSION=xcode_12_0
SDKS="macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator"
TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64
TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64