diff --git a/README.md b/README.md index bcea5c3aeaa..c9c639df22e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ without the need to ship an additional execution runtime. Prerequisites: * install JDK for your platform, instead of JRE. The build requires ```tools.jar```, which is not included in JRE; -* on macOS install Xcode 11 (Xcode 11.4 is required to compile Kotlin/Native from sources) +* on macOS install Xcode 11 (Xcode 11.5 is required to compile Kotlin/Native from sources) * on Fedora 26+ ```yum install ncurses-compat-libs``` may be needed * on recent Ubuntu ```apt install libncurses5``` is needed diff --git a/konan/konan.properties b/konan/konan.properties index c3c965954a8..75bae991d0f 100644 --- a/konan/konan.properties +++ b/konan/konan.properties @@ -43,12 +43,12 @@ llvmVersion.macos_x64 = 8.0.0 # Mac OS X. llvmHome.macos_x64 = clang-llvm-apple-8.0.0-darwin-macos -targetToolchain.macos_x64 = target-toolchain-xcode_11_4-macos_x64 +targetToolchain.macos_x64 = target-toolchain-xcode_11_5-macos_x64 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos -additionalToolsDir.macos_x64 = xcode-addon-xcode_11_4-macos_x64 +additionalToolsDir.macos_x64 = xcode-addon-xcode_11_5-macos_x64 arch.macos_x64 = x86_64 -targetSysRoot.macos_x64 = target-sysroot-xcode_11_4-macos_x64 +targetSysRoot.macos_x64 = target-sysroot-xcode_11_5-macos_x64 clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.macos_x64 = -O1 @@ -69,28 +69,28 @@ dependencies.macos_x64 = \ lldb-2-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-macos_x64.default = \ +target-sysroot-xcode_11_5-macos_x64.default = \ remote:internal -target-toolchain-xcode_11_4-macos_x64.default = \ +target-toolchain-xcode_11_5-macos_x64.default = \ remote:internal -xcode-addon-xcode_11_4-macos_x64.default = \ +xcode-addon-xcode_11_5-macos_x64.default = \ remote:internal # Apple's 32-bit iOS. -targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_11_4-macos_x64 +targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-ios_arm32 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-ios_arm32.default = \ +target-sysroot-xcode_11_5-ios_arm32.default = \ remote:internal arch.ios_arm32 = armv7 # Shared with 64-bit version. -targetSysRoot.ios_arm32 = target-sysroot-xcode_11_4-ios_arm64 +targetSysRoot.ios_arm32 = target-sysroot-xcode_11_5-ios_arm64 clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir clangNooptFlags.ios_arm32 = -O1 @@ -99,23 +99,23 @@ 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.4 +linkerKonanFlags.ios_arm32 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.5 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_4-macos_x64 +targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-ios_arm64 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-ios_arm64.default = \ +target-sysroot-xcode_11_5-ios_arm64.default = \ remote:internal arch.ios_arm64 = arm64 -targetSysRoot.ios_arm64 = target-sysroot-xcode_11_4-ios_arm64 +targetSysRoot.ios_arm64 = target-sysroot-xcode_11_5-ios_arm64 clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_arm64 = -O1 @@ -128,23 +128,23 @@ clangDynamicFlags.ios_arm64 = linkerNoDebugFlags.ios_arm64 = -S linkerDynamicFlags.ios_arm64 = -dylib -linkerKonanFlags.ios_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4 +linkerKonanFlags.ios_arm64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.5 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_4-macos_x64 +targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-ios_x64 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-ios_x64.default = \ +target-sysroot-xcode_11_5-ios_x64.default = \ remote:internal arch.ios_x64 = x86_64 -targetSysRoot.ios_x64 = target-sysroot-xcode_11_4-ios_x64 +targetSysRoot.ios_x64 = target-sysroot-xcode_11_5-ios_x64 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_x64 = -O1 @@ -152,7 +152,7 @@ clangOptFlags.ios_x64 = -O3 clangDebugFlags.ios_x64 = -O0 clangDynamicFlags.ios_x64 = -linkerKonanFlags.ios_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.4 +linkerKonanFlags.ios_x64 = -lSystem -lc++ -lobjc -framework Foundation -sdk_version 13.5 linkerOptimizationFlags.ios_x64 = -dead_strip linkerNoDebugFlags.ios_x64 = -S linkerDynamicFlags.ios_x64 = -dylib @@ -161,16 +161,16 @@ 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_4-macos_x64 +targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-tvos_x64 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-tvos_x64.default = \ +target-sysroot-xcode_11_5-tvos_x64.default = \ remote:internal arch.tvos_x64 = x86_64 -targetSysRoot.tvos_x64 = target-sysroot-xcode_11_4-tvos_x64 +targetSysRoot.tvos_x64 = target-sysroot-xcode_11_5-tvos_x64 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_x64 = -O1 @@ -187,16 +187,16 @@ 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_4-macos_x64 +targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-tvos_arm64 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-tvos_arm64.default = \ +target-sysroot-xcode_11_5-tvos_arm64.default = \ remote:internal arch.tvos_arm64 = arm64 -targetSysRoot.tvos_arm64 = target-sysroot-xcode_11_4-tvos_arm64 +targetSysRoot.tvos_arm64 = target-sysroot-xcode_11_5-tvos_arm64 clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_arm64 = -O1 @@ -213,16 +213,16 @@ osVersionMinFlagClang.tvos_arm64 = -mtvos-version-min osVersionMin.tvos_arm64 = 9.0 # watchOS armv7k -targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_11_4-macos_x64 +targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-watchos_arm32 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-watchos_arm32.default = \ +target-sysroot-xcode_11_5-watchos_arm32.default = \ remote:internal arch.watchos_arm32 = armv7k -targetSysRoot.watchos_arm32 = target-sysroot-xcode_11_4-watchos_arm32 +targetSysRoot.watchos_arm32 = target-sysroot-xcode_11_5-watchos_arm32 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_arm32 = -O1 @@ -239,16 +239,16 @@ osVersionMinFlagClang.watchos_arm32 = -mwatchos-version-min osVersionMin.watchos_arm32 = 5.0 # watchOS arm64_32 -targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_11_4-macos_x64 +targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-watchos_arm64 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-watchos_arm64.default = \ +target-sysroot-xcode_11_5-watchos_arm64.default = \ remote:internal arch.watchos_arm64 = arm64_32 -targetSysRoot.watchos_arm64 = target-sysroot-xcode_11_4-watchos_arm32 +targetSysRoot.watchos_arm64 = target-sysroot-xcode_11_5-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 @@ -266,16 +266,16 @@ 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_4-macos_x64 +targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_11_5-macos_x64 dependencies.macos_x64-watchos_x86 = \ libffi-3.2.1-3-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos -target-sysroot-xcode_11_4-watchos_x86.default = \ +target-sysroot-xcode_11_5-watchos_x86.default = \ remote:internal arch.watchos_x86 = i386 -targetSysRoot.watchos_x86 = target-sysroot-xcode_11_4-watchos_x86 +targetSysRoot.watchos_x86 = target-sysroot-xcode_11_5-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 diff --git a/tools/scripts/update_xcode.sh b/tools/scripts/update_xcode.sh index 16bc175af16..141d88352a3 100755 --- a/tools/scripts/update_xcode.sh +++ b/tools/scripts/update_xcode.sh @@ -2,7 +2,7 @@ set -e # "brew install coreutils" for grealpath. -KONAN_TOOLCHAIN_VERSION=xcode_11_4 +KONAN_TOOLCHAIN_VERSION=xcode_11_5 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