diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 5c24cbbaf14..aa89665146f 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -78,6 +78,9 @@ llvmVersion.mingw_x64 = 11.1.0 llvmVersion.macos_x64 = 11.1.0 llvmVersion.macos_arm64 = 11.1.0 +toolchainDependency.mingw_x64 = msys2-mingw-w64-x86_64-1 +toolchainDependency.mingw_x86 = msys2-mingw-w64-i686-1 + cacheableTargets.macos_x64 = \ macos_x64 \ ios_x64 \ @@ -499,7 +502,7 @@ dependencies.linux_x64 = \ targetToolchain.mingw_x64-linux_x64 = $llvmHome.mingw_x64 dependencies.mingw_x64-linux_x64 = \ x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ - msys2-mingw-w64-x86_64-1 + $toolchainDependency.mingw_x64 targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64 dependencies.macos_x64-linux_x64 = \ @@ -562,7 +565,7 @@ dependencies.linux_x64-linux_arm32_hfp = \ arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 dependencies.mingw_x64-linux_arm32_hfp = \ arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 \ - msys2-mingw-w64-x86_64-1 + $toolchainDependency.mingw_x64 dependencies.macos_x64-linux_arm32_hfp = \ arm-unknown-linux-gnueabihf-gcc-8.3.0-glibc-2.19-kernel-4.9-2 dependencies.macos_arm64-linux_arm32_hfp = \ @@ -621,7 +624,7 @@ dependencies.linux_x64-linux_arm64 = \ aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 dependencies.mingw_x64-linux_arm64 = \ aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 \ - msys2-mingw-w64-x86_64-1 + $toolchainDependency.mingw_x64 dependencies.macos_x64-linux_arm64 = \ aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 dependencies.macos_arm64-linux_arm64 = \ @@ -878,7 +881,7 @@ windows-kit-x64-v1-alpha2.default = \ msvc-x64-v1-alpha2.default = \ remote:internal -targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-1 +targetToolchain.mingw_x64 = $toolchainDependency.mingw_x64 targetToolchain.linux_x64-mingw_x64 = $llvmHome.linux_x64 targetToolchain.macos_x64-mingw_x64 = $llvmHome.macos_x64 targetToolchain.macos_arm64-mingw_x64 = $llvmHome.macos_arm64 @@ -887,13 +890,13 @@ targetToolchain.macos_arm64-mingw_x64 = $llvmHome.macos_arm64 dependencies.mingw_x64 = \ lldb-2-windows \ lld-12.0.1-windows-x64 \ - msys2-mingw-w64-x86_64-1 -dependencies.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-1 -dependencies.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-1 -dependencies.macos_arm64-mingw_x64 = msys2-mingw-w64-x86_64-1 + $toolchainDependency.mingw_x64 +dependencies.linux_x64-mingw_x64 = $toolchainDependency.mingw_x64 +dependencies.macos_x64-mingw_x64 = $toolchainDependency.mingw_x64 +dependencies.macos_arm64-mingw_x64 = $toolchainDependency.mingw_x64 targetTriple.mingw_x64 = x86_64-pc-windows-gnu -targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-1 +targetSysRoot.mingw_x64 = $toolchainDependency.mingw_x64 targetCpu.mingw_x64 = x86-64 targetCpuFeatures.mingw_x64 = +cx8,+fxsr,+mmx,+sse,+sse2,+x87 # For using with Universal Windows Platform (UWP) we need to use this slower option. @@ -913,7 +916,7 @@ runtimeDefinitions.mingw_x64 = USE_GCC_UNWIND=1 USE_PE_COFF_SYMBOLS=1 KONAN_WIND UNICODE KONAN_X64=1 KONAN_NO_MEMMEM=1 # Windows i686, based on mingw-w64. -targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-1 +targetToolchain.mingw_x64-mingw_x86 = $toolchainDependency.mingw_x86 targetToolchain.linux_x64-mingw_x86 = $llvmHome.linux_x64 targetToolchain.macos_x64-mingw_x86 = $llvmHome.macos_x64 targetToolchain.macos_arm64-mingw_x86 = $llvmHome.macos_arm64 @@ -924,17 +927,17 @@ linker.macos_x64-mingw_x86 = $targetToolchain.macos_x64-mingw_x86/bin/ld.lld linker.macos_arm64-mingw_x86 = $targetToolchain.macos_arm64-mingw_x86/bin/ld.lld dependencies.mingw_x64-mingw_x86 = \ - msys2-mingw-w64-i686-1 \ + $toolchainDependency.mingw_x86 \ lld-12.0.1-windows-x64 dependencies.linux_x64-mingw_x86 = \ - msys2-mingw-w64-i686-1 + $toolchainDependency.mingw_x86 dependencies.macos_x64-mingw_x86 = \ - msys2-mingw-w64-i686-1 + $toolchainDependency.mingw_x86 dependencies.macos_arm64-mingw_x86 = \ - msys2-mingw-w64-i686-1 + $toolchainDependency.mingw_x86 targetTriple.mingw_x86 = i686-pc-windows-gnu -targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-1 +targetSysRoot.mingw_x86 = $toolchainDependency.mingw_x86 # Make sure that SSE2 is available by setting target-cpu to pentium4 targetCpu.mingw_x86 = pentium4 # For using with Universal Windows Platform (UWP) we need to use slower -emulated-tls option.