From 7d8f7e54c38e96c6222f5b796fdf284f9ab828e5 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Thu, 19 Oct 2017 20:25:03 +0300
Subject: [PATCH] Recursively resolve libraries after immediateLibraries have
 been calculated.

---
 .../src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
index 227813fb2b9..8119b107af0 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanConfig.kt
@@ -89,14 +89,15 @@ class KonanConfig(val project: Project, val configuration: CompilerConfiguration
                 false
         ).let {
             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> {
         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()
     }