From 61ece4d364ed1450e7df7739785c0d9703b25719 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Fri, 4 Dec 2020 18:26:18 +0700
Subject: [PATCH] Cleanup Linker.kt a little

---
 kotlin-native/konan/konan.properties                        | 6 +++---
 .../main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
index a12774716db..bfd3ca88190 100644
--- a/kotlin-native/konan/konan.properties
+++ b/kotlin-native/konan/konan.properties
@@ -412,7 +412,7 @@ linkerNoDebugFlags.linux_x64 = -S
 linkerDynamicFlags.linux_x64 = -shared
 dynamicLinker.linux_x64 = /lib64/ld-linux-x86-64.so.2
 # targetSysRoot relative
-abiSpecificLibraries.linux_x64 = ../lib64 lib64 usr/lib64
+abiSpecificLibraries.linux_x64 = lib usr/lib ../lib64 lib64 usr/lib64
 runtimeDefinitions.linux_x64 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_X64=1 \
   USE_ELF_SYMBOLS=1 ELFSIZE=64 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1
 
@@ -530,7 +530,7 @@ clangDebugFlags.linux_mips32 = -O0
 clangDynamicFlags.linux_mips32 = -mrelocation-model pic
 dynamicLinker.linux_mips32 = /lib/ld.so.1
 # targetSysRoot relative
-abiSpecificLibraries.linux_mips32 =
+abiSpecificLibraries.linux_mips32 = lib usr/lib
 # TODO: reconsider KONAN_NO_64BIT_ATOMIC, once target MIPS can do proper 64-bit load/store/CAS.
 runtimeDefinitions.linux_mips32 = USE_GCC_UNWIND=1 KONAN_LINUX=1 KONAN_MIPS32=1 \
   USE_ELF_SYMBOLS=1 ELFSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1
@@ -563,7 +563,7 @@ clangDebugFlags.linux_mipsel32 = -O0
 clangDynamicFlags.linux_mipsel32 = -mrelocation-model pic
 dynamicLinker.linux_mipsel32 = /lib/ld.so.1
 # targetSysRoot relative
-abiSpecificLibraries.linux_mipsel32 =
+abiSpecificLibraries.linux_mipsel32 = lib usr/lib
 # TODO: reconsider KONAN_NO_64BIT_ATOMIC, once target MIPS can do proper 64-bit load/store/CAS.
 runtimeDefinitions.linux_mipsel32 = USE_GCC_UNWIND=1 KONAN_LINUX=1 \
   KONAN_MIPSEL32=1 USE_ELF_SYMBOLS=1 ELFSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1
diff --git a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
index 1c773592e25..add7662faeb 100644
--- a/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+++ b/kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
@@ -366,11 +366,9 @@ class GccBasedLinker(targetProperties: GccConfigurables)
             if (!dynamic) +"$absoluteTargetSysRoot/$crtPrefix/crt1.o"
             +"$absoluteTargetSysRoot/$crtPrefix/crti.o"
             +if (dynamic) "$libGcc/crtbeginS.o" else "$libGcc/crtbegin.o"
-            +"-L$llvmLib"
             +"-L$libGcc"
             if (!isMips) +"--hash-style=gnu" // MIPS doesn't support hash-style=gnu
             +specificLibs
-            +listOf("-L$absoluteTargetSysRoot/../lib", "-L$absoluteTargetSysRoot/lib", "-L$absoluteTargetSysRoot/usr/lib")
             if (optimize) +linkerOptimizationFlags
             if (!debug) +linkerNoDebugFlags
             if (dynamic) +linkerDynamicFlags