From 6953d29922021cf1d5898c0be76c0b13dc9f6591 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Mon, 9 Aug 2021 20:02:49 +0700 Subject: [PATCH] [K/N] Use smaller mingw-w64-x86_64 toolchain We don't need LLVM components there anymore because they live in a separate dependency now. --- kotlin-native/konan/konan.properties | 16 ++++++++-------- kotlin-native/samples/tetris/build.gradle.kts | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 313103148ca..14de0684dce 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -510,7 +510,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-clang-llvm-lld-compiler_rt-8.0.1 + msys2-mingw-w64-x86_64-1 targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64 dependencies.macos_x64-linux_x64 = \ @@ -573,7 +573,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-clang-llvm-lld-compiler_rt-8.0.1 + msys2-mingw-w64-x86_64-1 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 = \ @@ -632,7 +632,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-clang-llvm-lld-compiler_rt-8.0.1 + msys2-mingw-w64-x86_64-1 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 = \ @@ -874,7 +874,7 @@ runtimeDefinitions.android_x64 = __ANDROID__ USE_GCC_UNWIND=1 USE_ELF_SYMBOLS=1 # Windows x86-64, based on mingw-w64. llvmHome.mingw_x64 = $llvm.mingw_x64.dev -targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 +targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-1 libffiDir.mingw_x64 = libffi-3.3-windows-x64-1 windowsKitParts.mingw_x64 = windows-kit-x64-v1-alpha2 msvcParts.mingw_x64 = msvc-x64-v1-alpha2 @@ -886,16 +886,16 @@ windows-kit-x64-v1-alpha2.default = \ msvc-x64-v1-alpha2.default = \ remote:internal -targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 -targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 +targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-1 +targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-1 # for Windows we are currently using LLDB 9 dependencies.mingw_x64 = \ lldb-2-windows \ lld-12.0.1-windows-x64 \ - msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 + msys2-mingw-w64-x86_64-1 targetTriple.mingw_x64 = x86_64-pc-windows-gnu -targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 +targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-1 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. diff --git a/kotlin-native/samples/tetris/build.gradle.kts b/kotlin-native/samples/tetris/build.gradle.kts index 9a55a51aaae..e99742dec81 100644 --- a/kotlin-native/samples/tetris/build.gradle.kts +++ b/kotlin-native/samples/tetris/build.gradle.kts @@ -41,7 +41,7 @@ kotlin { presets["mingwX86"] -> kotlinNativeDataPath.resolve( "dependencies/msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1/bin") presets["mingwX64"] -> kotlinNativeDataPath.resolve( - "dependencies/msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1/bin") + "dependencies/msys2-mingw-w64-x86_64-1/bin") else -> throw GradleException("Unsupported presets") }.toString() inputs.file(inFile)