From 2d6f3e9d3f3ba6401dcf545df2a5db02a8f17595 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov <1580082+sbogolepov@users.noreply.github.com> Date: Tue, 21 May 2019 12:34:11 +0300 Subject: [PATCH] Fix Android configurables (#15) --- .../kotlin/org/jetbrains/kotlin/konan/target/Configurables.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 48265ac8f43..12ab4ce2d1f 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 @@ -104,10 +104,12 @@ interface LinuxBasedConfigurables : TargetableConfigurables, LlvmLtoFlags { interface LinuxConfigurables : LinuxBasedConfigurables interface LinuxMIPSConfigurables : LinuxBasedConfigurables interface RaspberryPiConfigurables : LinuxBasedConfigurables -interface AndroidConfigurables : TargetableConfigurables +interface AndroidConfigurables : TargetableConfigurables, LlvmLtoFlags interface WasmConfigurables : TargetableConfigurables, OptFlags, LlcFlags, LldFlags +// Codegen for Zephyr calls opt and llc with predefined set of flags +// so there is no need for OptFlags or LlcFlags. interface ZephyrConfigurables : TargetableConfigurables { val boardSpecificClangFlags get() = targetList("boardSpecificClangFlags") } \ No newline at end of file