Supply correct Native platform for module descriptor while compiling from CLI
This commit is contained in:
@@ -6,6 +6,7 @@ plugins {
|
|||||||
description = "Common klib metadata reader and writer"
|
description = "Common klib metadata reader and writer"
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
compileOnly(project(":compiler:cli-common"))
|
||||||
compileOnly(project(":compiler:frontend"))
|
compileOnly(project(":compiler:frontend"))
|
||||||
compileOnly(project(":core:deserialization"))
|
compileOnly(project(":core:deserialization"))
|
||||||
compileOnly(project(":compiler:serialization"))
|
compileOnly(project(":compiler:serialization"))
|
||||||
|
|||||||
+3
-1
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
|
|||||||
import org.jetbrains.kotlin.descriptors.konan.*
|
import org.jetbrains.kotlin.descriptors.konan.*
|
||||||
import org.jetbrains.kotlin.descriptors.konan.isInteropLibrary
|
import org.jetbrains.kotlin.descriptors.konan.isInteropLibrary
|
||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
|
import org.jetbrains.kotlin.platform.konan.KonanPlatforms
|
||||||
import org.jetbrains.kotlin.resolve.ImplicitIntegerCoercion
|
import org.jetbrains.kotlin.resolve.ImplicitIntegerCoercion
|
||||||
import org.jetbrains.kotlin.storage.StorageManager
|
import org.jetbrains.kotlin.storage.StorageManager
|
||||||
|
|
||||||
@@ -29,7 +30,8 @@ internal class KlibModuleDescriptorFactoryImpl(val createBuiltIns: (StorageManag
|
|||||||
capabilities = customCapabilities + mapOf(
|
capabilities = customCapabilities + mapOf(
|
||||||
KlibModuleOrigin.CAPABILITY to origin,
|
KlibModuleOrigin.CAPABILITY to origin,
|
||||||
ImplicitIntegerCoercion.MODULE_CAPABILITY to origin.isInteropLibrary()
|
ImplicitIntegerCoercion.MODULE_CAPABILITY to origin.isInteropLibrary()
|
||||||
)
|
),
|
||||||
|
platform = KonanPlatforms.defaultKonanPlatform
|
||||||
)
|
)
|
||||||
|
|
||||||
override fun createDescriptorAndNewBuiltIns(
|
override fun createDescriptorAndNewBuiltIns(
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ dependencies {
|
|||||||
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
|
compileOnly(intellijCoreDep()) { includeJars("intellij-core", "asm-all", rootProject = rootProject) }
|
||||||
|
|
||||||
compileOnly(project(":compiler:plugin-api"))
|
compileOnly(project(":compiler:plugin-api"))
|
||||||
|
compileOnly(project(":compiler:cli-common"))
|
||||||
compileOnly(project(":compiler:frontend"))
|
compileOnly(project(":compiler:frontend"))
|
||||||
compileOnly(project(":compiler:backend"))
|
compileOnly(project(":compiler:backend"))
|
||||||
compileOnly(project(":compiler:ir.backend.common"))
|
compileOnly(project(":compiler:ir.backend.common"))
|
||||||
|
|||||||
Reference in New Issue
Block a user