[K/N] Move kotlin-native/utilities/basic-utils to compiler/utils

This commit is contained in:
Alexander Shabalin
2024-02-02 20:50:18 +01:00
committed by Space Team
parent 3ab6e9de28
commit 4468167a64
30 changed files with 92 additions and 121 deletions
-1
View File
@@ -17,7 +17,6 @@ dependencies {
implementation(project(":native:frontend.native"))
implementation(project(":compiler:ir.psi2ir"))
implementation(project(":compiler:ir.serialization.native"))
implementation(project(":kotlin-native:utilities:basic-utils"))
implementation(project(":kotlin-util-klib-abi"))
}
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.konan.library.KonanLibrary
import org.jetbrains.kotlin.konan.library.resolverByName
import org.jetbrains.kotlin.konan.target.Distribution
import org.jetbrains.kotlin.konan.util.DependencyDirectories
import org.jetbrains.kotlin.konan.util.KonanHomeProvider
import org.jetbrains.kotlin.utils.KotlinNativePaths
import org.jetbrains.kotlin.library.*
import org.jetbrains.kotlin.library.abi.*
import org.jetbrains.kotlin.library.metadata.KlibMetadataFactories
@@ -447,10 +447,10 @@ class Library(val libraryNameOrPath: String, val requestedRepository: String?) {
val defaultModules = mutableListOf<ModuleDescriptorImpl>()
if (!module.isNativeStdlib()) {
val resolver = resolverByName(
emptyList(),
distributionKlib = Distribution(KonanHomeProvider.determineKonanHome()).klib,
skipCurrentDir = true,
logger = KlibToolLogger
emptyList(),
distributionKlib = Distribution(KotlinNativePaths.homePath.absolutePath).klib,
skipCurrentDir = true,
logger = KlibToolLogger
)
resolver.defaultLinks(false, true, true).mapTo(defaultModules) {
KlibFactories.DefaultDeserializedDescriptorFactory.createDescriptor(it, versionSpec, storageManager, module.builtIns, null)