From 77eff757837d26561a2375d65d28876e469e5b9e Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Mon, 16 Oct 2017 15:48:46 +0300 Subject: [PATCH] Swapped adding manifest addend properties and depends clause update. --- .../backend/konan/library/impl/KonanLibraryWriterImpl.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt index 428432845f0..8f6ecab485d 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/library/impl/KonanLibraryWriterImpl.kt @@ -87,10 +87,12 @@ class LibraryWriterImpl(override val libDir: File, moduleName: String, currentAb override fun addLinkDependencies(libraries: List) { if (libraries.isEmpty()) { - // make sure there are not leftovers from the .def file. manifestProperties.remove("depends") + // make sure there are no leftovers from the .def file. + return } else { - manifestProperties.setProperty("depends", libraries .map { it.uniqueName } . joinToString(" ")) + val newValue = libraries .map { it.uniqueName } . joinToString(" ") + manifestProperties.setProperty("depends", newValue) } } @@ -136,8 +138,8 @@ internal fun buildLibrary( included.forEach { library.addIncludedBinary(it) } - library.addLinkDependencies(linkDependencies) manifest ?.let { library.addManifestAddend(it) } + library.addLinkDependencies(linkDependencies) escapeAnalysis?.let { library.addEscapeAnalysis(it) } library.commit()