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

Moved qemu to the toolchain

Browse Source
This commit is contained in:
Sergey Bogolepov
2017-09-22 14:44:29 +07:00
committed by ilmat192
parent 46eed4efbb
commit 8746247d2d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+5 -4
View File
@@ -278,17 +278,18 @@ fun handleExceptionContinuation(x: (Throwable) -> Unit): Continuation<Any?> = ob
List<String> executionCommandLine(String exe) {
def properties = project.rootProject.konanProperties
def targetToolchain = TargetPropertiesKt.hostTargetString(properties, "targetToolchain", target)
def absoluteTargetToolchain = "$dependenciesDir/$targetToolchain"
if (target == KonanTarget.WASM32) {
def targetToolchain = TargetPropertiesKt.hostTargetString(properties, "targetToolchain", target)
def absoluteTargetToolchain = "$dependenciesDir/$targetToolchain"
def d8 = "$absoluteTargetToolchain/bin/d8"
def launcherJs = "${exe}.js"
return [d8, '--expose-wasm', launcherJs, '--', exe]
} else if (target == KonanTarget.MIPS || target == KonanTarget.MIPSEL) {
def targetSysroot = TargetPropertiesKt.targetString(properties, "targetSysRoot", target)
def absoluteTargetSysroot = "$dependenciesDir/$targetSysroot"
def qemu = "$absoluteTargetSysroot/bin/qemu-mips"
return [qemu, "-L", absoluteTargetSysroot, exe]
def qemu = target == KonanTarget.MIPS ? "qemu-mips" : "qemu-mipsel"
def absoluteQemu = "$absoluteTargetToolchain/bin/$qemu"
return [absoluteQemu, "-L", absoluteTargetSysroot, exe]
} else {
return [exe]
}