Fix .def file generation. (#1859)

JetBrains · Aug 10, 2018 · c9a702f · c9a702f
1 parent bd50d00
commit c9a702f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/...ve/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt b/...ve/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterGenerator.kt
@@ -870,7 +870,7 @@ internal class CAdapterGenerator(
         outputStreamWriter.close()
 
         if (context.config.target.family == Family.MINGW) {
-            outputStreamWriter = context.config.tempFiles
+            outputStreamWriter = context.config.outputFiles
                     .cAdapterDef
                     .printWriter()
             output("EXPORTS")

diff --git a/...d.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OutputFiles.kt b/...d.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/OutputFiles.kt
@@ -38,6 +38,7 @@ class OutputFiles(outputPath: String?, target: KonanTarget, produce: CompilerOut
      * Header file for dynamic library
      */
     val cAdapterHeader      by lazy { File("${outputName}_api.h") }
+    val cAdapterDef         by lazy { File("${outputName}_symbols.def") }
 
     /**
      * Main compiler's output file

diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/TempFiles.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/TempFiles.kt
@@ -26,7 +26,6 @@ class TempFiles(outputPath: String, pathToTemporaryDir: String? = null) {
     private val outputName = File(outputPath).name
 
     val nativeBinaryFile    by lazy { File(dir,"${outputName}.kt.bc") }
-    val cAdapterDef         by lazy { File(dir,"${outputName}_symbols.def") }
     val cAdapterCpp         by lazy { File(dir, "api.cpp") }
     val cAdapterBitcode     by lazy { File(dir, "api.bc") }