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

[LLVM][mingw_x86] LLVM 6.0.1 -> LLVM 8.0.1

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-09-27 14:27:14 +03:00
committed by Sergey Bogolepov
parent dd7a621676
commit aaf17d6679
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
konan/konan.properties
+8 -8
View File
@@ -593,24 +593,24 @@ linkerKonanFlags.mingw_x64 =-static-libgcc -static-libstdc++ \
linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections
# Windows i686, based on mingw-w64. # Windows i686, based on mingw-w64.
targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
dependencies.mingw_x64-mingw_x86 = \ dependencies.mingw_x64-mingw_x86 = \
msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \ msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1 \
msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \ msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
libffi-3.2.1-mingw-w64-x86-64 libffi-3.2.1-mingw-w64-x86-64
targetToolchain.linux_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 targetToolchain.linux_x64-mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
targetToolchain.macos_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 targetToolchain.macos_x64-mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
dependencies.linux_x64-mingw_x86 = \ dependencies.linux_x64-mingw_x86 = \
msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \ msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1 \
clang-llvm-6.0.1-linux-x86-64 \ clang-llvm-8.0.0-linux-x86-64 \
libffi-3.2.1-2-linux-x86-64 libffi-3.2.1-2-linux-x86-64
dependencies.macos_x64-mingw_x86 = \ dependencies.macos_x64-mingw_x86 = \
msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \ msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1 \
clang-llvm-apple-8.0.0-darwin-macos \ clang-llvm-apple-8.0.0-darwin-macos \
libffi-3.2.1-3-darwin-macos libffi-3.2.1-3-darwin-macos
quadruple.mingw_x86 = i686-w64-mingw32 quadruple.mingw_x86 = i686-w64-mingw32
targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
# For using with Universal Windows Platform (UWP) we need to use slower -emulated-tls option. # For using with Universal Windows Platform (UWP) we need to use slower -emulated-tls option.
# See https://youtrack.jetbrains.com/issue/KT-27654. # See https://youtrack.jetbrains.com/issue/KT-27654.
# TODO: remove, once fixed in mingw, check with the bug testcase. # TODO: remove, once fixed in mingw, check with the bug testcase.
samples/tetris/build.gradle.kts
+1 -1
View File
@@ -77,7 +77,7 @@ kotlin {
val compileWindowsResources: Exec? = if (isWindows) { val compileWindowsResources: Exec? = if (isWindows) {
val compileWindowsResources: Exec by tasks.creating(Exec::class) { val compileWindowsResources: Exec by tasks.creating(Exec::class) {
val windresDir = if (isMingwX86Build) val windresDir = if (isMingwX86Build)
kotlinNativeDataPath.resolve("dependencies/msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1/bin") kotlinNativeDataPath.resolve("dependencies/msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1/bin")
else else
kotlinNativeDataPath.resolve("dependencies/msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1/bin") kotlinNativeDataPath.resolve("dependencies/msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1/bin")