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

[K/N] Fix path to ld.gold on Windows

Browse Source 
targetToolchain.mingw_x64-linux_* are changed, so we should their usages
Probably, we could switch to LLD, but it requires additional testing.
This commit is contained in:
Sergey Bogolepov
2021-07-23 12:57:34 +07:00
committed by Space
parent 66ddd15798
commit a525f3f357
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/konan/konan.properties
+12 -6
View File
@@ -506,7 +506,8 @@ 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
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
targetToolchain.macos_x64-linux_x64 = $llvmHome.macos_x64
dependencies.macos_x64-linux_x64 = \
@@ -536,7 +537,8 @@ linkerDynamicFlags.linux_x64 = -shared
linker.linux_x64 = $targetToolchain.linux_x64/bin/ld.gold
linkerHostSpecificFlags.linux_x64-linux_x64 =
linker.mingw_x64-linux_x64 = $targetToolchain.mingw_x64-linux_x64/bin/ld.gold
# TODO: Check ld.lld from LLVM.
linker.mingw_x64-linux_x64 = $targetToolchain.mingw_x64/bin/ld.gold
linkerHostSpecificFlags.mingw_x64-linux_x64 =
linker.macos_x64-linux_x64 = $targetToolchain.macos_x64-linux_x64/bin/ld.lld
linkerHostSpecificFlags.macos_x64-linux_x64 =
@@ -566,7 +568,8 @@ emulatorExecutable.linux_x64-linux_arm32_hfp = qemu-arm-static-5.1.0-linux-2/qem
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
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
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 = \
@@ -595,7 +598,8 @@ staticLibraryRelocationMode.linux_arm32_hfp = pic
linker.linux_x64-linux_arm32_hfp = $targetToolchain.linux_x64-linux_arm32_hfp/bin/ld
linkerHostSpecificFlags.linux_x64-linux_arm32_hfp =
linker.mingw_x64-linux_arm32_hfp = $targetToolchain.mingw_x64-linux_arm32_hfp/bin/ld.gold
# TODO: Check ld.lld from LLVM.
linker.mingw_x64-linux_arm32_hfp = $targetToolchain.mingw_x64/bin/ld.gold
linkerHostSpecificFlags.mingw_x64-linux_arm32_hfp =
linker.macos_x64-linux_arm32_hfp = $targetToolchain.macos_x64-linux_arm32_hfp/bin/ld.lld
linkerHostSpecificFlags.macos_x64-linux_arm32_hfp =
@@ -623,7 +627,8 @@ emulatorExecutable.linux_x64-linux_arm64 = qemu-aarch64-static-5.1.0-linux-2/qem
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
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
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 = \
@@ -649,7 +654,8 @@ staticLibraryRelocationMode.linux_arm64 = pic
linker.linux_x64-linux_arm64 = $targetToolchain.linux_x64-linux_arm64/bin/ld.gold
linkerHostSpecificFlags.linux_x64-linux_arm64 =
linker.mingw_x64-linux_arm64 = $targetToolchain.mingw_x64-linux_arm64/bin/ld.gold
# TODO: Check ld.lld from LLVM.
linker.mingw_x64-linux_arm64 = $targetToolchain.mingw_x64/bin/ld.gold
linkerHostSpecificFlags.mingw_x64-linux_arm64 =
linker.macos_x64-linux_arm64 = $targetToolchain.macos_x64-linux_arm64/bin/ld.lld
linkerHostSpecificFlags.macos_x64-linux_arm64 =