Moved qemu to the toolchain
This commit is contained in:
committed by
ilmat192
parent
46eed4efbb
commit
8746247d2d
@@ -278,17 +278,18 @@ fun handleExceptionContinuation(x: (Throwable) -> Unit): Continuation<Any?> = ob
|
|||||||
|
|
||||||
List<String> executionCommandLine(String exe) {
|
List<String> executionCommandLine(String exe) {
|
||||||
def properties = project.rootProject.konanProperties
|
def properties = project.rootProject.konanProperties
|
||||||
|
def targetToolchain = TargetPropertiesKt.hostTargetString(properties, "targetToolchain", target)
|
||||||
|
def absoluteTargetToolchain = "$dependenciesDir/$targetToolchain"
|
||||||
if (target == KonanTarget.WASM32) {
|
if (target == KonanTarget.WASM32) {
|
||||||
def targetToolchain = TargetPropertiesKt.hostTargetString(properties, "targetToolchain", target)
|
|
||||||
def absoluteTargetToolchain = "$dependenciesDir/$targetToolchain"
|
|
||||||
def d8 = "$absoluteTargetToolchain/bin/d8"
|
def d8 = "$absoluteTargetToolchain/bin/d8"
|
||||||
def launcherJs = "${exe}.js"
|
def launcherJs = "${exe}.js"
|
||||||
return [d8, '--expose-wasm', launcherJs, '--', exe]
|
return [d8, '--expose-wasm', launcherJs, '--', exe]
|
||||||
} else if (target == KonanTarget.MIPS || target == KonanTarget.MIPSEL) {
|
} else if (target == KonanTarget.MIPS || target == KonanTarget.MIPSEL) {
|
||||||
def targetSysroot = TargetPropertiesKt.targetString(properties, "targetSysRoot", target)
|
def targetSysroot = TargetPropertiesKt.targetString(properties, "targetSysRoot", target)
|
||||||
def absoluteTargetSysroot = "$dependenciesDir/$targetSysroot"
|
def absoluteTargetSysroot = "$dependenciesDir/$targetSysroot"
|
||||||
def qemu = "$absoluteTargetSysroot/bin/qemu-mips"
|
def qemu = target == KonanTarget.MIPS ? "qemu-mips" : "qemu-mipsel"
|
||||||
return [qemu, "-L", absoluteTargetSysroot, exe]
|
def absoluteQemu = "$absoluteTargetToolchain/bin/$qemu"
|
||||||
|
return [absoluteQemu, "-L", absoluteTargetSysroot, exe]
|
||||||
} else {
|
} else {
|
||||||
return [exe]
|
return [exe]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user