azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WASM build.

Browse Source
This commit is contained in:
Nikolay Igotti
2018-04-23 01:13:11 +03:00
parent 86349baef7
commit d4c0384bcc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+5 -4
View File
@@ -325,13 +325,14 @@ open class WasmLinker(targetProperties: WasmConfigurables)
optimize: Boolean, debug: Boolean, optimize: Boolean, debug: Boolean,
kind: LinkerOutputKind, outputDsymBundle: String): List<Command> { kind: LinkerOutputKind, outputDsymBundle: String): List<Command> {
if (kind != LinkerOutputKind.EXECUTABLE) throw Error("Unsupported linker output kind") 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() { return listOf(object : Command() {
override fun execute() { override fun execute() {
val src = File(objectFiles.single()) val src = File(objectFiles.single())
val dst = File(executable) val dst = File(executable)
src.recursiveCopyTo(dst) src.recursiveCopyTo(dst)
javaScriptLink(args, executable) javaScriptLink(libraries, executable)
} }
private fun javaScriptLink(jsFiles: List<String>, executable: String): String { private fun javaScriptLink(jsFiles: List<String>, executable: String): String {
@@ -344,13 +345,13 @@ open class WasmLinker(targetProperties: WasmConfigurables)
| konan.moduleEntry(arguments); | konan.moduleEntry(arguments);
|}""".trimMargin() |}""".trimMargin()
linkedJavaScript.writeBytes(linkerHeader.toByteArray()); linkedJavaScript.writeText(linkerHeader)
jsFiles.forEach { jsFiles.forEach {
linkedJavaScript.appendBytes(File(it).readBytes()) linkedJavaScript.appendBytes(File(it).readBytes())
} }
linkedJavaScript.appendBytes(linkerFooter.toByteArray()); linkedJavaScript.appendBytes(linkerFooter.toByteArray())
return linkedJavaScript.name return linkedJavaScript.name
} }
}) })