From d4c0384bcccae11fe68a7734ba65c0a6c31de8a0 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Mon, 23 Apr 2018 01:13:11 +0300 Subject: [PATCH] Fix WASM build. --- .../kotlin/org/jetbrains/kotlin/konan/target/Linker.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt index e24b935eb4d..380dc5aab25 100644 --- a/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt +++ b/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt @@ -325,13 +325,14 @@ open class WasmLinker(targetProperties: WasmConfigurables) optimize: Boolean, debug: Boolean, kind: LinkerOutputKind, outputDsymBundle: String): List { if (kind != LinkerOutputKind.EXECUTABLE) throw Error("Unsupported linker output kind") - // TODO(horsh): make it proper list. + + // TODO(horsh): maybe rethink it. return listOf(object : Command() { override fun execute() { val src = File(objectFiles.single()) val dst = File(executable) src.recursiveCopyTo(dst) - javaScriptLink(args, executable) + javaScriptLink(libraries, executable) } private fun javaScriptLink(jsFiles: List, executable: String): String { @@ -344,13 +345,13 @@ open class WasmLinker(targetProperties: WasmConfigurables) | konan.moduleEntry(arguments); |}""".trimMargin() - linkedJavaScript.writeBytes(linkerHeader.toByteArray()); + linkedJavaScript.writeText(linkerHeader) jsFiles.forEach { linkedJavaScript.appendBytes(File(it).readBytes()) } - linkedJavaScript.appendBytes(linkerFooter.toByteArray()); + linkedJavaScript.appendBytes(linkerFooter.toByteArray()) return linkedJavaScript.name } })