KT-58862: Remove cinterop -mode option

metadata cinterop libraries perform pretty well for years,
so we can drop this flag.
This commit is contained in:
Sergey Bogolepov
2023-06-21 17:30:50 +03:00
committed by Space Team
parent 807e7f1c28
commit d433d1eb3f
8 changed files with 5 additions and 67 deletions
@@ -16,9 +16,7 @@ import org.jetbrains.kotlin.konan.target.*
import org.jetbrains.kotlin.konan.util.KonanHomeProvider
import org.jetbrains.kotlin.konan.util.PlatformLibsInfo
import org.jetbrains.kotlin.konan.util.visibleName
import org.jetbrains.kotlin.native.interop.gen.jvm.GenerationMode
import org.jetbrains.kotlin.native.interop.gen.jvm.parseKeyValuePairs
import org.jetbrains.kotlin.native.interop.tool.CommonInteropArguments.Companion.DEFAULT_MODE
import org.jetbrains.kotlin.native.interop.tool.SHORT_MODULE_NAME
import java.io.PrintWriter
import java.io.StringWriter
@@ -66,7 +64,7 @@ private enum class CacheKind(val outputKind: CompilerOutputKind) {
STATIC_CACHE(CompilerOutputKind.STATIC_CACHE)
}
private class CInteropOptions(val mode: GenerationMode, val additionalArguments: List<String>)
private class CInteropOptions(val additionalArguments: List<String>)
// TODO: Use Distribution's paths after compiler update.
fun generatePlatformLibraries(args: Array<String>) = usingNativeMemoryAllocator {
@@ -101,13 +99,6 @@ fun generatePlatformLibraries(args: Array<String>) = usingNativeMemoryAllocator
val cacheDirectoryPath by argParser.option(
ArgType.String, "cache-directory", "c", "Cache output directory")
val mode by argParser.option(
ArgType.Choice<GenerationMode>(),
fullName = "mode",
shortName = "m",
description = "The way interop library is generated."
).default(DEFAULT_MODE)
val verbose by argParser.option(
ArgType.Boolean,
"verbose", "v",
@@ -167,7 +158,6 @@ fun generatePlatformLibraries(args: Array<String>) = usingNativeMemoryAllocator
}
val cinteropOptions = CInteropOptions(
mode,
additionalArguments = buildList {
if (overrideKonanProperties.isNotEmpty()) {
add("-Xoverride-konan-properties")
@@ -270,7 +260,6 @@ private fun generateLibrary(
"-compiler-option", "-fmodules-cache-path=${tmpDirectory.child("clangModulesCache").absolutePath}",
"-repo", outputDirectory.absolutePath,
"-no-default-libs", "-no-endorsed-libs", "-Xpurge-user-libs", "-nopack",
"-mode", cinteropOptions.mode.modeName,
*cinteropOptions.additionalArguments.toTypedArray(),
"-$SHORT_MODULE_NAME", def.shortLibraryName,
*def.depends.flatMap { listOf("-l", "$outputDirectory/${it.libraryName}") }.toTypedArray()