[REVERTME] filtering out ANDROID_X64, WATCHOS_{X64,ARM64}, TVOS_{X64,ARM64} from enabled platform till their full support
This commit is contained in:
+5
@@ -61,6 +61,11 @@ private class LlvmPipelineConfiguration(context: Context) {
|
|||||||
KonanTarget.ANDROID_ARM64 -> "cortex-a57"
|
KonanTarget.ANDROID_ARM64 -> "cortex-a57"
|
||||||
KonanTarget.LINUX_MIPS32 -> "mips32r2"
|
KonanTarget.LINUX_MIPS32 -> "mips32r2"
|
||||||
KonanTarget.LINUX_MIPSEL32 -> "mips32r2"
|
KonanTarget.LINUX_MIPSEL32 -> "mips32r2"
|
||||||
|
KonanTarget.ANDROID_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_X64 -> TODO("implement me")
|
||||||
KonanTarget.WASM32,
|
KonanTarget.WASM32,
|
||||||
is KonanTarget.ZEPHYR -> error("There is no support for ${target.name} target yet.")
|
is KonanTarget.ZEPHYR -> error("There is no support for ${target.name} target yet.")
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -95,7 +95,7 @@ allprojects {
|
|||||||
|
|
||||||
void setupHostAndTarget() {
|
void setupHostAndTarget() {
|
||||||
ext.hostName = platformManager.hostName
|
ext.hostName = platformManager.hostName
|
||||||
ext.targetList = platformManager.enabled.collect { it.visibleName } as List
|
ext.targetList = platformManager.filteredOutEnabledButNotSupported.collect { it.visibleName } as List
|
||||||
ext.konanTargetList = platformManager.enabled as List
|
ext.konanTargetList = platformManager.enabled as List
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+2
-1
@@ -80,7 +80,8 @@ enum DependencyKind {
|
|||||||
|
|
||||||
def platformManager = rootProject.ext.platformManager
|
def platformManager = rootProject.ext.platformManager
|
||||||
|
|
||||||
platformManager.enabled.each { target ->
|
|
||||||
|
platformManager.filteredOutEnabledButNotSupported.each { target ->
|
||||||
def loader = platformManager.loader(target)
|
def loader = platformManager.loader(target)
|
||||||
|
|
||||||
task "${target}Dependencies"(type: NativeDep) {
|
task "${target}Dependencies"(type: NativeDep) {
|
||||||
|
|||||||
@@ -103,6 +103,12 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
|
|||||||
"-Xclang", "-isystem$absoluteTargetSysRoot/include/compat",
|
"-Xclang", "-isystem$absoluteTargetSysRoot/include/compat",
|
||||||
"-Xclang", "-isystem$absoluteTargetSysRoot/include/libc")
|
"-Xclang", "-isystem$absoluteTargetSysRoot/include/libc")
|
||||||
|
|
||||||
|
KonanTarget.ANDROID_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_X64 -> TODO("implement me")
|
||||||
|
|
||||||
is KonanTarget.ZEPHYR ->
|
is KonanTarget.ZEPHYR ->
|
||||||
listOf("-target", targetArg!!,
|
listOf("-target", targetArg!!,
|
||||||
"-fno-rtti",
|
"-fno-rtti",
|
||||||
@@ -244,6 +250,13 @@ class ClangArgs(private val configurables: Configurables) : Configurables by con
|
|||||||
"-DKONAN_NO_MEMMEM",
|
"-DKONAN_NO_MEMMEM",
|
||||||
"-DKONAN_NO_CTORS_SECTION=1")
|
"-DKONAN_NO_CTORS_SECTION=1")
|
||||||
|
|
||||||
|
KonanTarget.ANDROID_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_X64 -> TODO("implement me")
|
||||||
|
|
||||||
|
|
||||||
is KonanTarget.ZEPHYR ->
|
is KonanTarget.ZEPHYR ->
|
||||||
listOf( "-DKONAN_ZEPHYR=1",
|
listOf( "-DKONAN_ZEPHYR=1",
|
||||||
"-DKONAN_NO_FFI=1",
|
"-DKONAN_NO_FFI=1",
|
||||||
|
|||||||
@@ -50,7 +50,10 @@ fun loadConfigurables(target: KonanTarget, properties: Properties, baseDir: Stri
|
|||||||
MingwConfigurablesImpl(target, properties, baseDir)
|
MingwConfigurablesImpl(target, properties, baseDir)
|
||||||
KonanTarget.WASM32 ->
|
KonanTarget.WASM32 ->
|
||||||
WasmConfigurablesImpl(target, properties, baseDir)
|
WasmConfigurablesImpl(target, properties, baseDir)
|
||||||
|
KonanTarget.ANDROID_X64 -> TODO("unimplemented: $target")
|
||||||
|
KonanTarget.WATCHOS_ARM64, KonanTarget.WATCHOS_X64 -> TODO("unimplemented: $target")
|
||||||
|
KonanTarget.TVOS_ARM64, KonanTarget.TVOS_X64 -> TODO("unimplemented: $target")
|
||||||
is KonanTarget.ZEPHYR ->
|
is KonanTarget.ZEPHYR ->
|
||||||
ZephyrConfigurablesImpl(target, properties, baseDir)
|
ZephyrConfigurablesImpl(target, properties, baseDir)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -435,6 +435,11 @@ fun linker(configurables: Configurables): LinkerFlags =
|
|||||||
MingwLinker(configurables as MingwConfigurables)
|
MingwLinker(configurables as MingwConfigurables)
|
||||||
KonanTarget.WASM32 ->
|
KonanTarget.WASM32 ->
|
||||||
WasmLinker(configurables as WasmConfigurables)
|
WasmLinker(configurables as WasmConfigurables)
|
||||||
|
KonanTarget.ANDROID_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.WATCHOS_X64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_ARM64 -> TODO("implement me")
|
||||||
|
KonanTarget.TVOS_X64 -> TODO("implement me")
|
||||||
is KonanTarget.ZEPHYR ->
|
is KonanTarget.ZEPHYR ->
|
||||||
ZephyrLinker(configurables as ZephyrConfigurables)
|
ZephyrLinker(configurables as ZephyrConfigurables)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ class Platform(val configurables: Configurables)
|
|||||||
class PlatformManager(distribution: Distribution = Distribution(), experimental: Boolean = false) :
|
class PlatformManager(distribution: Distribution = Distribution(), experimental: Boolean = false) :
|
||||||
HostManager(distribution, experimental) {
|
HostManager(distribution, experimental) {
|
||||||
|
|
||||||
private val loaders = enabled.map {
|
private val loaders = filteredOutEnabledButNotSupported.map {
|
||||||
it to loadConfigurables(it, distribution.properties, DependencyProcessor.defaultDependenciesRoot.absolutePath)
|
it to loadConfigurables(it, distribution.properties, DependencyProcessor.defaultDependenciesRoot.absolutePath)
|
||||||
}.toMap()
|
}.toMap()
|
||||||
|
|
||||||
@@ -44,5 +44,12 @@ class PlatformManager(distribution: Distribution = Distribution(), experimental:
|
|||||||
val hostPlatform = platforms.getValue(host)
|
val hostPlatform = platforms.getValue(host)
|
||||||
|
|
||||||
fun loader(target: KonanTarget) = loaders.getValue(target)
|
fun loader(target: KonanTarget) = loaders.getValue(target)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TODO: Don't forget to delete this field and replace all its usages to `enabled`.
|
||||||
|
*/
|
||||||
|
val filteredOutEnabledButNotSupported
|
||||||
|
get() = enabled.filterNot { it == KonanTarget.ANDROID_X64 || it == KonanTarget.WATCHOS_X64 || it == KonanTarget.WATCHOS_ARM64 ||
|
||||||
|
it == KonanTarget.TVOS_X64 || it == KonanTarget.TVOS_ARM64}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user