From 4ee712c5d730105760585f8b25f0acd72a351c1a Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Fri, 3 Apr 2020 10:40:20 +0700
Subject: [PATCH] [Configurables] Rename LinuxConfigurables to GccConfigurables

Because there are many implementations of libc.
---
 .../kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt   | 2 +-
 .../org/jetbrains/kotlin/konan/target/Configurables.kt      | 2 +-
 .../org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt  | 6 +++---
 .../main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
index da59ca2712b..05b529123b3 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
@@ -353,7 +353,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
     }
 
     private val extraHostClangArgs =
-            if (configurables is LinuxConfigurables) {
+            if (configurables is GccConfigurables) {
                 listOf("--gcc-toolchain=${configurables.absoluteGccToolchain}")
             } else {
                 emptyList()
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
index 61721891707..3ca4be09000 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
@@ -67,7 +67,7 @@ interface AppleConfigurables : Configurables, ClangFlags {
 
 interface MingwConfigurables : TargetableConfigurables, ClangFlags
 
-interface LinuxConfigurables : TargetableConfigurables, ClangFlags {
+interface GccConfigurables : TargetableConfigurables, ClangFlags {
     val gccToolchain get() = hostString("gccToolchain")
     val absoluteGccToolchain get() = absolute(gccToolchain)
 
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt
index 339f22130e3..cbee682e97d 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.konan.target
 
 import org.jetbrains.kotlin.konan.properties.*
 
-class LinuxConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
-    : LinuxConfigurables, KonanPropertiesLoader(target, properties, baseDir)
+class GccConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
+    : GccConfigurables, KonanPropertiesLoader(target, properties, baseDir)
 
 class AndroidConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
     : AndroidConfigurables, KonanPropertiesLoader(target, properties, baseDir)
@@ -37,7 +37,7 @@ class ZephyrConfigurablesImpl(target: KonanTarget, properties: Properties, baseD
 fun loadConfigurables(target: KonanTarget, properties: Properties, baseDir: String?): Configurables = when (target)  {
         KonanTarget.LINUX_X64, KonanTarget.LINUX_ARM32_HFP, KonanTarget.LINUX_ARM64,
         KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32 ->
-            LinuxConfigurablesImpl(target, properties, baseDir)
+            GccConfigurablesImpl(target, properties, baseDir)
 
         KonanTarget.MACOS_X64,
         KonanTarget.IOS_ARM32, KonanTarget.IOS_ARM64, KonanTarget.IOS_X64,
diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
index ce199bc4fc9..8130e703518 100644
--- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
@@ -289,8 +289,8 @@ open class MacOSBasedLinker(targetProperties: AppleConfigurables)
             listOf(dsymutil, "-dump-debug-map", executable)
 }
 
-open class LinuxBasedLinker(targetProperties: LinuxConfigurables)
-    : LinkerFlags(targetProperties), LinuxConfigurables by targetProperties {
+open class GccBasedLinker(targetProperties: GccConfigurables)
+    : LinkerFlags(targetProperties), GccConfigurables by targetProperties {
 
     private val ar = if (HostManager.hostIsMac) "$absoluteTargetToolchain/bin/llvm-ar"
         else "$absoluteTargetToolchain/bin/ar"
@@ -486,7 +486,7 @@ fun linker(configurables: Configurables): LinkerFlags =
             KonanTarget.LINUX_X64,
             KonanTarget.LINUX_ARM32_HFP,  KonanTarget.LINUX_ARM64,
             KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32 ->
-                LinuxBasedLinker(configurables as LinuxConfigurables)
+                GccBasedLinker(configurables as GccConfigurables)
 
             KonanTarget.MACOS_X64,
             KonanTarget.TVOS_X64, KonanTarget.TVOS_ARM64,