Add emulator properties to gcc configurables
This commit is contained in:
committed by
Stanislav Erokhin
parent
02379d9412
commit
9e93ee81e3
+9
@@ -63,6 +63,15 @@ interface Configurables : TargetableExternalStorage {
|
||||
val runtimeDefinitions get() = targetList("runtimeDefinitions")
|
||||
}
|
||||
|
||||
interface ConfigurablesWithEmulator : Configurables {
|
||||
val emulatorDependency get() = hostTargetString("emulatorDependency")
|
||||
// TODO: We need to find a way to represent absolute path in properties.
|
||||
// In case of QEMU, absolute path to dynamic linker should be specified.
|
||||
val emulatorExecutable get() = hostTargetString("emulatorExecutable")
|
||||
|
||||
val absoluteEmulatorExecutable get() = absolute(emulatorExecutable)
|
||||
}
|
||||
|
||||
interface TargetableConfigurables : Configurables {
|
||||
val targetArg get() = targetString("quadruple")
|
||||
}
|
||||
|
||||
+4
-1
@@ -19,7 +19,10 @@ package org.jetbrains.kotlin.konan.target
|
||||
import org.jetbrains.kotlin.konan.properties.*
|
||||
|
||||
class GccConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
|
||||
: GccConfigurables, KonanPropertiesLoader(target, properties, baseDir)
|
||||
: GccConfigurables, KonanPropertiesLoader(target, properties, baseDir), ConfigurablesWithEmulator {
|
||||
override val dependencies: List<String>
|
||||
get() = super.dependencies + listOfNotNull(emulatorDependency)
|
||||
}
|
||||
|
||||
class AndroidConfigurablesImpl(target: KonanTarget, properties: Properties, baseDir: String?)
|
||||
: AndroidConfigurables, KonanPropertiesLoader(target, properties, baseDir)
|
||||
|
||||
Reference in New Issue
Block a user