From 3984c4ff6492940bd3628e65e36a077920e141a9 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Tue, 12 Dec 2017 01:28:20 +0300 Subject: [PATCH] Produce windows .def files together with .dlls. --- .../src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt | 2 +- .../src/org/jetbrains/kotlin/backend/konan/TempFiles.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt index 9686ebcb3d2..71ba318698b 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt @@ -292,7 +292,7 @@ private class ExportedElement(val kind: ElementKind, internal class CAdapterGenerator(val context: Context, internal val codegen: CodeGenerator) : IrElementVisitorVoid { private val scopes = mutableListOf() - internal val prefix: String = context.config.outputName + internal val prefix: String = context.config.moduleId private lateinit var outputStreamWriter: PrintWriter override fun visitElement(element: IrElement) { diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TempFiles.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TempFiles.kt index fba7eb7a0ec..a6bcff0fe28 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TempFiles.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/TempFiles.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.konan.file.* class TempFiles(val outputName: String) { val nativeBinaryFile by lazy { File("${outputName}.kt.bc") } val cAdapterHeader by lazy { File("${outputName}_api.h") } + val cAdapterDef by lazy { File("${outputName}_symbols.def") } val cAdapterCpp by lazy { createTempFile("api", ".cpp").deleteOnExit() } val cAdapterBitcode by lazy { createTempFile("api", ".bc").deleteOnExit() }