Make klib info report targets available.
This commit is contained in:
committed by
alexander-gorshenev
parent
646117a60b
commit
114010bbcd
+1
-1
@@ -49,7 +49,7 @@ class Distribution(val config: CompilerConfiguration) {
|
|||||||
|
|
||||||
val stdlib = "$klib/stdlib"
|
val stdlib = "$klib/stdlib"
|
||||||
val runtime = config.get(KonanConfigKeys.RUNTIME_FILE)
|
val runtime = config.get(KonanConfigKeys.RUNTIME_FILE)
|
||||||
?: "$stdlib/$target/native/runtime.bc"
|
?: "$stdlib/targets/$target/native/runtime.bc"
|
||||||
|
|
||||||
val llvmHome = "$dependenciesDir/${properties.propertyString("llvmHome.$hostSuffix")}"
|
val llvmHome = "$dependenciesDir/${properties.propertyString("llvmHome.$hostSuffix")}"
|
||||||
val hostSysRoot = "$dependenciesDir/${properties.propertyString("targetSysRoot.$hostSuffix")}"
|
val hostSysRoot = "$dependenciesDir/${properties.propertyString("targetSysRoot.$hostSuffix")}"
|
||||||
|
|||||||
+3
-1
@@ -73,8 +73,10 @@ interface SplitLibraryScheme {
|
|||||||
get() = File(libDir, "manifest")
|
get() = File(libDir, "manifest")
|
||||||
val resourcesDir
|
val resourcesDir
|
||||||
get() = File(libDir, "resources")
|
get() = File(libDir, "resources")
|
||||||
|
val targetsDir
|
||||||
|
get() = File(libDir, "targets")
|
||||||
val targetDir
|
val targetDir
|
||||||
get() = File(libDir, target!!)
|
get() = File(targetsDir, target!!)
|
||||||
val kotlinDir
|
val kotlinDir
|
||||||
get() = File(targetDir, "kotlin")
|
get() = File(targetDir, "kotlin")
|
||||||
val nativeDir
|
val nativeDir
|
||||||
|
|||||||
+2
-2
@@ -352,7 +352,7 @@ targetList.each { target ->
|
|||||||
|
|
||||||
from(project(':runtime').file("build/$target")) {
|
from(project(':runtime').file("build/$target")) {
|
||||||
include("*.bc")
|
include("*.bc")
|
||||||
into("klib/stdlib/$target/native")
|
into("klib/stdlib/targets/$target/native")
|
||||||
}
|
}
|
||||||
from(project(':runtime').file("build/${target}Stdlib")) {
|
from(project(':runtime').file("build/${target}Stdlib")) {
|
||||||
include('**')
|
include('**')
|
||||||
@@ -360,7 +360,7 @@ targetList.each { target ->
|
|||||||
}
|
}
|
||||||
from(project(':runtime').file("build/${target}Start.bc")) {
|
from(project(':runtime').file("build/${target}Start.bc")) {
|
||||||
rename("${target}Start.bc", 'start.bc')
|
rename("${target}Start.bc", 'start.bc')
|
||||||
into("klib/stdlib/$target/native")
|
into("klib/stdlib/targets/$target/native")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,6 +78,8 @@ class Library(val name: String, val repository: String, val target: String) {
|
|||||||
val moduleName = header.getProperty("module_name")!!
|
val moduleName = header.getProperty("module_name")!!
|
||||||
println("Module name: $moduleName")
|
println("Module name: $moduleName")
|
||||||
println("ABI version: $headerAbiVersion")
|
println("ABI version: $headerAbiVersion")
|
||||||
|
val targets = splitLibrary.targetsDir.listFiles.map{it.name}.joinToString(", ")
|
||||||
|
print("Available targets: $targets\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
fun install() {
|
fun install() {
|
||||||
|
|||||||
Reference in New Issue
Block a user