azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added libraryPaths def file property.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-09-12 14:29:05 +03:00
committed by alexander-gorshenev
parent 820a009163
commit 6187726ee7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt
+9 -7
View File
@@ -342,12 +342,14 @@ private fun selectNativeLanguage(config: Properties): Language {
private fun resolveLibraries(staticLibraries: List<String>, libraryPaths: List<String>): List<String> { private fun resolveLibraries(staticLibraries: List<String>, libraryPaths: List<String>): List<String> {
val result = mutableListOf<String>() val result = mutableListOf<String>()
staticLibraries.forEach { library -> staticLibraries.forEach { library ->
libraryPaths.forEach forEachPath@ { path ->
val combined = "$path/$library" val resolution = libraryPaths.map { "$it/$library" }
if (File(combined).exists()) { .find { File(it).exists() }
result.add(combined)
return@forEachPath if (resolution != null) {
} result.add(resolution)
} else {
error("Could not find '$library' binary in neither of $libraryPaths")
} }
} }
return result return result
@@ -426,7 +428,7 @@ private fun processLib(konanHome: String,
val linker = args["-linker"]?.atMostOne() ?: config.getProperty("linker") ?: "clang" val linker = args["-linker"]?.atMostOne() ?: config.getProperty("linker") ?: "clang"
val excludedFunctions = config.getSpaceSeparated("excludedFunctions").toSet() val excludedFunctions = config.getSpaceSeparated("excludedFunctions").toSet()
val staticLibraries = config.getSpaceSeparated("staticLibraries") + args["-staticLibrary"].orEmpty() val staticLibraries = config.getSpaceSeparated("staticLibraries") + args["-staticLibrary"].orEmpty()
val libraryPaths = args["-libraryPath"].orEmpty() val libraryPaths = config.getSpaceSeparated("libraryPaths") + args["-libraryPath"].orEmpty()
argsToCompiler ?. let { it.addAll(argsToCompiler(staticLibraries, libraryPaths)) } argsToCompiler ?. let { it.addAll(argsToCompiler(staticLibraries, libraryPaths)) }
val fqParts = (args["-pkg"]?.atMostOne() ?: config.getProperty("package"))?.let { val fqParts = (args["-pkg"]?.atMostOne() ?: config.getProperty("package"))?.let {