diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
index 5f1a58dea46..87b74b05d20 100644
--- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
+++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryImpl.kt
@@ -34,18 +34,12 @@ open class TargetedLibraryImpl(
 
     private val target: KonanTarget? get() = access.target
 
-    override val targetList by lazy {
-        access.inPlace { it: TargetedKotlinLibraryLayout ->
-            if (!it.targetsDir.exists)
-                // TODO: We have a choice: either assume it is the CURRENT TARGET
-                //  or a list of ALL KNOWN targets.
-                access.target ?. let { listOf(it.visibleName) } ?: emptyList()
-            else
-                it.targetsDir.listFiles.map {
-                    it.name
-                }
+    override val targetList: List<String>
+        get() = nativeTargets.ifEmpty {
+            // TODO: We have a choice: either assume it is the CURRENT TARGET
+            //  or a list of ALL KNOWN targets.
+            listOfNotNull(access.target?.visibleName)
         }
-    }
 
     override val manifestProperties: Properties by lazy {
         val properties = access.inPlace {
diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt
index 9fcace2bc67..68dc8ede292 100644
--- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt
+++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt
@@ -34,7 +34,7 @@ class KonanLibraryWriterImpl(
 
         val layout: KonanLibraryLayoutForWriter = KonanLibraryLayoutForWriter(libDir, target),
 
-        base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, nopack, shortName),
+        base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, listOf(target.visibleName), nopack, shortName),
         bitcode: BitcodeWriter = BitcodeWriterImpl(layout),
         metadata: MetadataWriter = MetadataWriterImpl(layout),
         ir: IrWriter = IrMonoliticWriterImpl(layout)