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

Write BuiltInsPlatform to manifest

Browse Source 
(cherry picked from commit 49bff7924798036adc974ccc5762fd39414bfe8f)
This commit is contained in:
Dmitry Savvinov
2020-03-02 18:20:04 +03:00
committed by Vasily Levchenko
parent dbda4174c7
commit c1cd14aa93
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt
+3
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.library.KotlinLibraryVersioning
import org.jetbrains.kotlin.library.KotlinAbiVersion import org.jetbrains.kotlin.library.KotlinAbiVersion
import org.jetbrains.kotlin.library.KotlinLibrary import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.library.SerializedMetadata import org.jetbrains.kotlin.library.SerializedMetadata
import org.jetbrains.kotlin.library.impl.BuiltInsPlatform
import org.jetbrains.kotlin.util.removeSuffixIfPresent import org.jetbrains.kotlin.util.removeSuffixIfPresent
import java.util.* import java.util.*
@@ -48,6 +49,8 @@ fun createInteropLibrary(arguments: LibraryCreationArguments) {
arguments.moduleName, arguments.moduleName,
version, version,
arguments.target, arguments.target,
BuiltInsPlatform.NATIVE,
nopack = arguments.nopack nopack = arguments.nopack
).apply { ).apply {
val metadata = arguments.metadata.write(ChunkingWriteStrategy()) val metadata = arguments.metadata.write(ChunkingWriteStrategy())
shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt
+3 -2
View File
@@ -28,11 +28,12 @@ class KonanLibraryWriterImpl(
moduleName: String, moduleName: String,
versions: KotlinLibraryVersioning, versions: KotlinLibraryVersioning,
target: KonanTarget, target: KonanTarget,
builtInsPlatform: BuiltInsPlatform,
nopack: Boolean = false, nopack: Boolean = false,
val layout: KonanLibraryLayoutForWriter = KonanLibraryLayoutForWriter(libDir, target), val layout: KonanLibraryLayoutForWriter = KonanLibraryLayoutForWriter(libDir, target),
base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, nopack), base: BaseWriter = BaseWriterImpl(layout, moduleName, versions, builtInsPlatform, nopack),
bitcode: BitcodeWriter = BitcodeWriterImpl(layout), bitcode: BitcodeWriter = BitcodeWriterImpl(layout),
metadata: MetadataWriter = MetadataWriterImpl(layout), metadata: MetadataWriter = MetadataWriterImpl(layout),
ir: IrWriter = IrMonoliticWriterImpl(layout) ir: IrWriter = IrMonoliticWriterImpl(layout)
@@ -54,7 +55,7 @@ fun buildLibrary(
dataFlowGraph: ByteArray? dataFlowGraph: ByteArray?
): KonanLibraryLayout { ): KonanLibraryLayout {
val library = KonanLibraryWriterImpl(File(output), moduleName, versions, target, nopack) val library = KonanLibraryWriterImpl(File(output), moduleName, versions, target, BuiltInsPlatform.NATIVE, nopack)
library.addMetadata(metadata) library.addMetadata(metadata)
if (ir != null) { if (ir != null) {