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

[Configurables] Rename LinuxConfigurables to GccConfigurables

Browse Source 
Because there are many implementations of libc.
This commit is contained in:
Sergey Bogolepov
2020-04-03 10:40:20 +07:00
committed by Sergey Bogolepov
parent 2e09de854a
commit 4ee712c5d7
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+1 -1
View File
@@ -353,7 +353,7 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
} }
private val extraHostClangArgs = private val extraHostClangArgs =
if (configurables is LinuxConfigurables) { if (configurables is GccConfigurables) {
listOf("--gcc-toolchain=${configurables.absoluteGccToolchain}") listOf("--gcc-toolchain=${configurables.absoluteGccToolchain}")
} else { } else {
emptyList() emptyList()
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
+1 -1
View File
@@ -67,7 +67,7 @@ interface AppleConfigurables : Configurables, ClangFlags {
interface MingwConfigurables : TargetableConfigurables, ClangFlags interface MingwConfigurables : TargetableConfigurables, ClangFlags
interface LinuxConfigurables : TargetableConfigurables, ClangFlags { interface GccConfigurables : TargetableConfigurables, ClangFlags {
val gccToolchain get() = hostString("gccToolchain") val gccToolchain get() = hostString("gccToolchain")
val absoluteGccToolchain get() = absolute(gccToolchain) val absoluteGccToolchain get() = absolute(gccToolchain)
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ConfigurablesImpl.kt
+3 -3
View File
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.konan.target
import org.jetbrains.kotlin.konan.properties.* import org.jetbrains.kotlin.konan.properties.*
class LinuxConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?) class GccConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
: LinuxConfigurables, KonanPropertiesLoader(target, properties, baseDir) : GccConfigurables, KonanPropertiesLoader(target, properties, baseDir)
class AndroidConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?) class AndroidConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
: AndroidConfigurables, KonanPropertiesLoader(target, properties, baseDir) : 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) { fun loadConfigurables(target: KonanTarget, properties: Properties, baseDir: String?): Configurables = when (target) {
KonanTarget.LINUX_X64, KonanTarget.LINUX_ARM32_HFP, KonanTarget.LINUX_ARM64, KonanTarget.LINUX_X64, KonanTarget.LINUX_ARM32_HFP, KonanTarget.LINUX_ARM64,
KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32 -> KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32 ->
LinuxConfigurablesImpl(target, properties, baseDir) GccConfigurablesImpl(target, properties, baseDir)
KonanTarget.MACOS_X64, KonanTarget.MACOS_X64,
KonanTarget.IOS_ARM32, KonanTarget.IOS_ARM64, KonanTarget.IOS_X64, KonanTarget.IOS_ARM32, KonanTarget.IOS_ARM64, KonanTarget.IOS_X64,
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+3 -3
View File
@@ -289,8 +289,8 @@ open class MacOSBasedLinker(targetProperties: AppleConfigurables)
listOf(dsymutil, "-dump-debug-map", executable) listOf(dsymutil, "-dump-debug-map", executable)
} }
open class LinuxBasedLinker(targetProperties: LinuxConfigurables) open class GccBasedLinker(targetProperties: GccConfigurables)
: LinkerFlags(targetProperties), LinuxConfigurables by targetProperties { : LinkerFlags(targetProperties), GccConfigurables by targetProperties {
private val ar = if (HostManager.hostIsMac) "$absoluteTargetToolchain/bin/llvm-ar" private val ar = if (HostManager.hostIsMac) "$absoluteTargetToolchain/bin/llvm-ar"
else "$absoluteTargetToolchain/bin/ar" else "$absoluteTargetToolchain/bin/ar"
@@ -486,7 +486,7 @@ fun linker(configurables: Configurables): LinkerFlags =
KonanTarget.LINUX_X64, KonanTarget.LINUX_X64,
KonanTarget.LINUX_ARM32_HFP, KonanTarget.LINUX_ARM64, KonanTarget.LINUX_ARM32_HFP, KonanTarget.LINUX_ARM64,
KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32 -> KonanTarget.LINUX_MIPS32, KonanTarget.LINUX_MIPSEL32 ->
LinuxBasedLinker(configurables as LinuxConfigurables) GccBasedLinker(configurables as GccConfigurables)
KonanTarget.MACOS_X64, KonanTarget.MACOS_X64,
KonanTarget.TVOS_X64, KonanTarget.TVOS_ARM64, KonanTarget.TVOS_X64, KonanTarget.TVOS_ARM64,