Write BuiltInsPlatform to manifest
(cherry picked from commit 49bff7924798036adc974ccc5762fd39414bfe8f)
This commit is contained in:
committed by
Vasily Levchenko
parent
dbda4174c7
commit
c1cd14aa93
+3
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.library.KotlinLibraryVersioning
|
||||
import org.jetbrains.kotlin.library.KotlinAbiVersion
|
||||
import org.jetbrains.kotlin.library.KotlinLibrary
|
||||
import org.jetbrains.kotlin.library.SerializedMetadata
|
||||
import org.jetbrains.kotlin.library.impl.BuiltInsPlatform
|
||||
import org.jetbrains.kotlin.util.removeSuffixIfPresent
|
||||
import java.util.*
|
||||
|
||||
@@ -48,6 +49,8 @@ fun createInteropLibrary(arguments: LibraryCreationArguments) {
|
||||
arguments.moduleName,
|
||||
version,
|
||||
arguments.target,
|
||||
|
||||
BuiltInsPlatform.NATIVE,
|
||||
nopack = arguments.nopack
|
||||
).apply {
|
||||
val metadata = arguments.metadata.write(ChunkingWriteStrategy())
|
||||
|
||||
+3
-2
@@ -28,11 +28,12 @@ class KonanLibraryWriterImpl(
|
||||
moduleName: String,
|
||||
versions: KotlinLibraryVersioning,
|
||||
target: KonanTarget,
|
||||
builtInsPlatform: BuiltInsPlatform,
|
||||
nopack: Boolean = false,
|
||||
|
||||
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),
|
||||
metadata: MetadataWriter = MetadataWriterImpl(layout),
|
||||
ir: IrWriter = IrMonoliticWriterImpl(layout)
|
||||
@@ -54,7 +55,7 @@ fun buildLibrary(
|
||||
dataFlowGraph: ByteArray?
|
||||
): KonanLibraryLayout {
|
||||
|
||||
val library = KonanLibraryWriterImpl(File(output), moduleName, versions, target, nopack)
|
||||
val library = KonanLibraryWriterImpl(File(output), moduleName, versions, target, BuiltInsPlatform.NATIVE, nopack)
|
||||
|
||||
library.addMetadata(metadata)
|
||||
if (ir != null) {
|
||||
|
||||
Reference in New Issue
Block a user