From 8746247d2dd7b38bf9ea735b79276b85e58ab7e7 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Fri, 22 Sep 2017 14:44:29 +0700 Subject: [PATCH] Moved qemu to the toolchain --- .../main/groovy/org/jetbrains/kotlin/KonanTest.groovy | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index c776920ab5b..b9f6654588e 100644 --- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -278,17 +278,18 @@ fun handleExceptionContinuation(x: (Throwable) -> Unit): Continuation = ob List 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] }