From 4b5429c2aa98c1f06af65a52a06c620a0b0634d9 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <1580082+sbogolepov@users.noreply.github.com>
Date: Mon, 27 May 2019 11:47:50 +0300
Subject: [PATCH] Use clang for android, linux and mingw targets (#13)

---
 .../jetbrains/kotlin/konan/target/Configurables.kt  | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

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 12ab4ce2d1f..34fdd7e39ce 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
@@ -26,13 +26,6 @@ interface ClangFlags : TargetableExternalStorage {
     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 {
     val llcFlags get()      = targetList("llcFlags")
     val llcNooptFlags get() = targetList("llcNooptFlags")
@@ -89,9 +82,9 @@ interface AppleConfigurables : Configurables, ClangFlags {
     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 absoluteGccToolchain get() = absolute(gccToolchain)
 
@@ -104,7 +97,7 @@ interface LinuxBasedConfigurables : TargetableConfigurables, LlvmLtoFlags {
 interface LinuxConfigurables : LinuxBasedConfigurables
 interface LinuxMIPSConfigurables : LinuxBasedConfigurables
 interface RaspberryPiConfigurables : LinuxBasedConfigurables
-interface AndroidConfigurables : TargetableConfigurables, LlvmLtoFlags
+interface AndroidConfigurables : TargetableConfigurables, ClangFlags
 
 interface WasmConfigurables : TargetableConfigurables, OptFlags, LlcFlags, LldFlags