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

Add kotlin runtime modulemap for swift export as part of kotlin-native dist #KT-65673 fixed

Browse Source 
Co-authored-by: Alexander Shabalin <alexander.shabalin@ashabalin.me>

Merge-request: KT-MR-14493
Merged-by: Artem Olkov <artem.olkov@jetbrains.com>
This commit is contained in:
Artem Olkov
2024-02-26 12:51:57 +00:00
committed by Space Team
parent 28a305a826
commit dd9332d9e1
13 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/utils/src/org/jetbrains/kotlin/konan/target/Distribution.kt
+4
View File
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.konan.properties.Properties
import org.jetbrains.kotlin.konan.properties.keepOnlyDefaultProfiles
import org.jetbrains.kotlin.konan.properties.loadProperties
import org.jetbrains.kotlin.konan.util.DependencyDirectories
import java.nio.file.Path
class Distribution private constructor(private val serialized: Serialized) : java.io.Serializable {
constructor(
@@ -88,6 +89,9 @@ class Distribution private constructor(private val serialized: Serialized) : jav
val stdlib = "$klib/common/stdlib"
val stdlibDefaultComponent = "$stdlib/default"
val kotlinRuntimeForSwiftHome = "$konanHome/konan/swift_export/kotlin_runtime"
val kotlinRuntimeForSwiftModuleMap = "$kotlinRuntimeForSwiftHome/module.modulemap"
fun defaultNatives(target: KonanTarget) = "$konanHome/konan/targets/${target.visibleName}/native"
fun runtime(target: KonanTarget) = runtimeFileOverride ?: "${defaultNatives(target)}/runtime.bc"