Make klib info report targets available.

This commit is contained in:
Alexander Gorshenev
2017-06-06 15:06:41 +03:00
committed by alexander-gorshenev
parent 646117a60b
commit 114010bbcd
4 changed files with 8 additions and 4 deletions
@@ -49,7 +49,7 @@ class Distribution(val config: CompilerConfiguration) {
val stdlib = "$klib/stdlib"
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 hostSysRoot = "$dependenciesDir/${properties.propertyString("targetSysRoot.$hostSuffix")}"
@@ -73,8 +73,10 @@ interface SplitLibraryScheme {
get() = File(libDir, "manifest")
val resourcesDir
get() = File(libDir, "resources")
val targetsDir
get() = File(libDir, "targets")
val targetDir
get() = File(libDir, target!!)
get() = File(targetsDir, target!!)
val kotlinDir
get() = File(targetDir, "kotlin")
val nativeDir
+2 -2
View File
@@ -352,7 +352,7 @@ targetList.each { target ->
from(project(':runtime').file("build/$target")) {
include("*.bc")
into("klib/stdlib/$target/native")
into("klib/stdlib/targets/$target/native")
}
from(project(':runtime').file("build/${target}Stdlib")) {
include('**')
@@ -360,7 +360,7 @@ targetList.each { target ->
}
from(project(':runtime').file("build/${target}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")!!
println("Module name: $moduleName")
println("ABI version: $headerAbiVersion")
val targets = splitLibrary.targetsDir.listFiles.map{it.name}.joinToString(", ")
print("Available targets: $targets\n")
}
fun install() {