gradle: do not lose debugging options from java exec
This commit is contained in:
committed by
vvlevchenko
parent
bcd346d0f4
commit
104a983282
@@ -50,6 +50,12 @@ abstract class KonanTest extends JavaExec {
|
|||||||
dependsOn(project.rootProject.tasks['dist'])
|
dependsOn(project.rootProject.tasks['dist'])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
void setJvmArgs(Iterable<?> arguments) {
|
||||||
|
super.setJvmArgs(arguments + "-Dkonan.home=${dist.canonicalPath}" +
|
||||||
|
"-Djava.library.path=${dist.canonicalPath}/konan/nativelib")
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
void exec() {
|
void exec() {
|
||||||
// Perhaps later we will return this exec() back but for now rest of infrastructure expects
|
// Perhaps later we will return this exec() back but for now rest of infrastructure expects
|
||||||
@@ -64,9 +70,7 @@ abstract class KonanTest extends JavaExec {
|
|||||||
try {
|
try {
|
||||||
main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt'
|
main = 'org.jetbrains.kotlin.cli.bc.K2NativeKt'
|
||||||
classpath = project.configurations.cli_bc
|
classpath = project.configurations.cli_bc
|
||||||
jvmArgs =["-ea",
|
enableAssertions = true
|
||||||
"-Dkonan.home=${dist.canonicalPath}",
|
|
||||||
"-Djava.library.path=${dist.canonicalPath}/konan/nativelib"]
|
|
||||||
args = ["-output", output,
|
args = ["-output", output,
|
||||||
*filesToCompile,
|
*filesToCompile,
|
||||||
*moreArgs,
|
*moreArgs,
|
||||||
|
|||||||
Reference in New Issue
Block a user