From 0b5b07f6e2f5239d7f16372e856aa2eda377c1a1 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Thu, 7 Apr 2022 18:37:51 +0300 Subject: [PATCH] [K/N] Update MinGW dependencies Include fixes for KT-50983 and KT-48558 --- kotlin-native/konan/konan.properties | 4 ++-- kotlin-native/samples/tetris/build.gradle.kts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 2dad4a710e6..ae75e27780f 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -78,8 +78,8 @@ 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 +toolchainDependency.mingw_x64 = msys2-mingw-w64-x86_64-2 +toolchainDependency.mingw_x86 = msys2-mingw-w64-i686-2 toolchainDependency.linux_x64 = x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 toolchainDependency.linux_arm64 = aarch64-unknown-linux-gnu-gcc-8.3.0-glibc-2.25-kernel-4.9-2 toolchainDependency.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2 diff --git a/kotlin-native/samples/tetris/build.gradle.kts b/kotlin-native/samples/tetris/build.gradle.kts index 8825de7bad8..6b782129ac4 100644 --- a/kotlin-native/samples/tetris/build.gradle.kts +++ b/kotlin-native/samples/tetris/build.gradle.kts @@ -39,9 +39,9 @@ kotlin { val windresTask = tasks.register(taskName) { val llvmDir = when (preset) { presets["mingwX86"] -> kotlinNativeDataPath.resolve( - "dependencies/msys2-mingw-w64-i686-1/bin") + "dependencies/msys2-mingw-w64-i686-2/bin") presets["mingwX64"] -> kotlinNativeDataPath.resolve( - "dependencies/msys2-mingw-w64-x86_64-1/bin") + "dependencies/msys2-mingw-w64-x86_64-2/bin") else -> throw GradleException("Unsupported presets") }.toString() inputs.file(inFile)