From c1cd14aa9301ccd541084f5f1170bab26da69135 Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Mon, 2 Mar 2020 18:20:04 +0300
Subject: [PATCH] Write BuiltInsPlatform to manifest

(cherry picked from commit 49bff7924798036adc974ccc5762fd39414bfe8f)
---
 .../kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt  | 3 +++
 .../kotlin/konan/library/impl/KonanLibraryWriterImpl.kt      | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt
index f780efc9e0f..79dfb219fde 100644
--- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt
+++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt
@@ -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())
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 921f82b4730..19e5e3f641e 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
@@ -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) {