Swapped adding manifest addend properties and depends clause update.
This commit is contained in:
committed by
alexander-gorshenev
parent
e84ab4abfe
commit
77eff75783
+5
-3
@@ -87,10 +87,12 @@ class LibraryWriterImpl(override val libDir: File, moduleName: String, currentAb
|
|||||||
|
|
||||||
override fun addLinkDependencies(libraries: List<KonanLibraryReader>) {
|
override fun addLinkDependencies(libraries: List<KonanLibraryReader>) {
|
||||||
if (libraries.isEmpty()) {
|
if (libraries.isEmpty()) {
|
||||||
// make sure there are not leftovers from the .def file.
|
|
||||||
manifestProperties.remove("depends")
|
manifestProperties.remove("depends")
|
||||||
|
// make sure there are no leftovers from the .def file.
|
||||||
|
return
|
||||||
} else {
|
} 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 {
|
included.forEach {
|
||||||
library.addIncludedBinary(it)
|
library.addIncludedBinary(it)
|
||||||
}
|
}
|
||||||
library.addLinkDependencies(linkDependencies)
|
|
||||||
manifest ?.let { library.addManifestAddend(it) }
|
manifest ?.let { library.addManifestAddend(it) }
|
||||||
|
library.addLinkDependencies(linkDependencies)
|
||||||
escapeAnalysis?.let { library.addEscapeAnalysis(it) }
|
escapeAnalysis?.let { library.addEscapeAnalysis(it) }
|
||||||
|
|
||||||
library.commit()
|
library.commit()
|
||||||
|
|||||||
Reference in New Issue
Block a user