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

[K/N] Update MinGW dependencies

Browse Source 
Include fixes for KT-50983 and KT-48558
This commit is contained in:
Sergey Bogolepov
2022-04-07 18:37:51 +03:00
committed by Space
parent 7bab9a1389
commit 0b5b07f6e2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/konan/konan.properties
+2 -2
View File
@@ -78,8 +78,8 @@ llvmVersion.mingw_x64 = 11.1.0
llvmVersion.macos_x64 = 11.1.0 llvmVersion.macos_x64 = 11.1.0
llvmVersion.macos_arm64 = 11.1.0 llvmVersion.macos_arm64 = 11.1.0
toolchainDependency.mingw_x64 = msys2-mingw-w64-x86_64-1 toolchainDependency.mingw_x64 = msys2-mingw-w64-x86_64-2
toolchainDependency.mingw_x86 = msys2-mingw-w64-i686-1 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_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_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 toolchainDependency.linux_mips32 = mips-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
kotlin-native/samples/tetris/build.gradle.kts
+2 -2
View File
@@ -39,9 +39,9 @@ kotlin {
val windresTask = tasks.register<Exec>(taskName) { val windresTask = tasks.register<Exec>(taskName) {
val llvmDir = when (preset) { val llvmDir = when (preset) {
presets["mingwX86"] -> kotlinNativeDataPath.resolve( presets["mingwX86"] -> kotlinNativeDataPath.resolve(
"dependencies/msys2-mingw-w64-i686-1/bin") "dependencies/msys2-mingw-w64-i686-2/bin")
presets["mingwX64"] -> kotlinNativeDataPath.resolve( 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") else -> throw GradleException("Unsupported presets")
}.toString() }.toString()
inputs.file(inFile) inputs.file(inFile)