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

Use clang for android, linux and mingw targets (#13)

Browse Source
This commit is contained in:
Sergey Bogolepov
2019-05-27 11:47:50 +03:00
committed by Ilya Matveev
parent f5cad39065
commit 4b5429c2aa
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt
+3 -10
View File
@@ -26,13 +26,6 @@ interface ClangFlags : TargetableExternalStorage {
val clangDynamicFlags get() = targetList("clangDynamicFlags") val clangDynamicFlags get() = targetList("clangDynamicFlags")
} }
interface LlvmLtoFlags : TargetableExternalStorage {
val llvmLtoNooptFlags get() = targetList("llvmLtoNooptFlags")
val llvmLtoOptFlags get() = targetList("llvmLtoOptFlags")
val llvmLtoFlags get() = targetList("llvmLtoFlags")
val llvmLtoDynamicFlags get() = targetList("llvmLtoDynamicFlags")
}
interface LlcFlags : TargetableExternalStorage { interface LlcFlags : TargetableExternalStorage {
val llcFlags get() = targetList("llcFlags") val llcFlags get() = targetList("llcFlags")
val llcNooptFlags get() = targetList("llcNooptFlags") val llcNooptFlags get() = targetList("llcNooptFlags")
@@ -89,9 +82,9 @@ interface AppleConfigurables : Configurables, ClangFlags {
val absoluteAdditionalToolsDir get() = absolute(additionalToolsDir) val absoluteAdditionalToolsDir get() = absolute(additionalToolsDir)
} }
interface MingwConfigurables : TargetableConfigurables, LlvmLtoFlags interface MingwConfigurables : TargetableConfigurables, ClangFlags
interface LinuxBasedConfigurables : TargetableConfigurables, LlvmLtoFlags { interface LinuxBasedConfigurables : TargetableConfigurables, ClangFlags {
val gccToolchain get() = hostString("gccToolchain") val gccToolchain get() = hostString("gccToolchain")
val absoluteGccToolchain get() = absolute(gccToolchain) val absoluteGccToolchain get() = absolute(gccToolchain)
@@ -104,7 +97,7 @@ interface LinuxBasedConfigurables : TargetableConfigurables, LlvmLtoFlags {
interface LinuxConfigurables : LinuxBasedConfigurables interface LinuxConfigurables : LinuxBasedConfigurables
interface LinuxMIPSConfigurables : LinuxBasedConfigurables interface LinuxMIPSConfigurables : LinuxBasedConfigurables
interface RaspberryPiConfigurables : LinuxBasedConfigurables interface RaspberryPiConfigurables : LinuxBasedConfigurables
interface AndroidConfigurables : TargetableConfigurables, LlvmLtoFlags interface AndroidConfigurables : TargetableConfigurables, ClangFlags
interface WasmConfigurables : TargetableConfigurables, OptFlags, LlcFlags, LldFlags interface WasmConfigurables : TargetableConfigurables, OptFlags, LlcFlags, LldFlags