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

Move Kotlin/Native compiler arguments into :compiler:cli:cli-common

Browse Source 
This allows to reference them in the Gradle plugins without enabling
kotlin-native part of the repository

^KT-53108 In Progress
This commit is contained in:
Yahor Berdnikau
2022-07-08 12:28:46 +02:00
committed by Space
parent 13713323cf
commit 603d043abc
5 changed files with 493 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/utilities/cli-runner/build.gradle
+1
View File
@@ -19,6 +19,7 @@ dependencies {
implementation project(":kotlin-stdlib")
implementation project(":kotlin-stdlib-common")
implementation project(':kotlin-native:backend.native')
implementation project(":compiler:cli-common")
implementation project(':kotlin-native:Interop:StubGenerator')
implementation project(':kotlin-native:klib')
implementation project(":kotlin-native:utilities:basic-utils")
kotlin-native/utilities/cli-runner/src/main/kotlin/org/jetbrains/kotlin/cli/utilities/InteropCompiler.kt
+2 -2
View File
@@ -4,7 +4,7 @@
*/
package org.jetbrains.kotlin.cli.utilities
import org.jetbrains.kotlin.cli.bc.SHORT_MODULE_NAME_ARG
import org.jetbrains.kotlin.cli.common.arguments.K2NativeCompilerArguments
import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.target.PlatformManager
import org.jetbrains.kotlin.konan.util.KonanHomeProvider
@@ -73,7 +73,7 @@ fun invokeInterop(flavor: String, args: Array<String>, runFromDaemon: Boolean):
(if (purgeUserLibs) arrayOf("-$PURGE_USER_LIBS") else emptyArray()) +
(if (nopack) arrayOf("-$NOPACK") else emptyArray()) +
moduleName?.let { arrayOf("-module-name", it) }.orEmpty() +
shortModuleName?.let { arrayOf("$SHORT_MODULE_NAME_ARG=$it") }.orEmpty() +
shortModuleName?.let { arrayOf("${K2NativeCompilerArguments.SHORT_MODULE_NAME_ARG}=$it") }.orEmpty() +
arguments.kotlincOption
}