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

Recursively resolve libraries after immediateLibraries have been calculated.

Browse Source
This commit is contained in:
Alexander Gorshenev
2017-10-19 20:25:03 +03:00
committed by alexander-gorshenev
parent e2e883ee08
commit 7d8f7e54c3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+3 -2
View File
@@ -89,14 +89,15 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
false false
).let { ).let {
warnOnLibraryDuplicates(it.map { it.libraryFile }) warnOnLibraryDuplicates(it.map { it.libraryFile })
it.distinctBy { it.libraryFile.absolutePath } val result = it.distinctBy { it.libraryFile.absolutePath }
resolver.resolveLibrariesRecursive(result, targetManager.target, currentAbiVersion)
result
} }
} }
fun librariesWithDependencies(moduleDescriptor: ModuleDescriptor?): List<KonanLibraryReader> { fun librariesWithDependencies(moduleDescriptor: ModuleDescriptor?): List<KonanLibraryReader> {
if (moduleDescriptor == null) error("purgeUnneeded() only works correctly after resolve is over, and we have successfully marked package files as needed or not needed.") if (moduleDescriptor == null) error("purgeUnneeded() only works correctly after resolve is over, and we have successfully marked package files as needed or not needed.")
resolver.resolveLibrariesRecursive(immediateLibraries, targetManager.target, currentAbiVersion)
return immediateLibraries.purgeUnneeded().withResolvedDependencies() return immediateLibraries.purgeUnneeded().withResolvedDependencies()
} }