From 2331475776300818f07b2823f5fbf9caa78017d6 Mon Sep 17 00:00:00 2001 From: LepilkinaElena Date: Mon, 8 Feb 2021 17:06:46 +0300 Subject: [PATCH] Use klib prefix for temporary directory for klibs (#4686) --- .../kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt | 2 +- .../kotlin/konan/library/impl/KonanLibraryWriterImpl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt index 4a0f66c84aa..51b94c5cc6f 100644 --- a/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt +++ b/kotlin-native/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/InteropLibraryCreation.kt @@ -45,7 +45,7 @@ fun createInteropLibrary( irVersion = KlibIrVersion.INSTANCE.toString() ) val libFile = File(outputPath) - val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir(moduleName) + val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir("klib") val layout = KonanLibraryLayoutForWriter(libFile, unzippedDir, target) KonanLibraryWriterImpl( moduleName, diff --git a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt index 009c25ff286..719273be57c 100644 --- a/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt +++ b/kotlin-native/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/impl/KonanLibraryWriterImpl.kt @@ -58,7 +58,7 @@ fun buildLibrary( ): KonanLibraryLayout { val libFile = File(output) - val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir(moduleName) + val unzippedDir = if (nopack) libFile else org.jetbrains.kotlin.konan.file.createTempDir("klib") val layout = KonanLibraryLayoutForWriter(libFile, unzippedDir, target) val library = KonanLibraryWriterImpl( moduleName,