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

build: Fix javaArgs in stdlib build

Browse Source
This commit is contained in:
Ilya Matveev
2017-08-25 14:16:38 +07:00
committed by ilmat192
parent 7fadfa5a0c
commit f218d36aa9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/build.gradle
+2 -2
View File
@@ -173,7 +173,7 @@ targetList.each { target ->
task("${target}Stdlib", type: JavaExec) { task("${target}Stdlib", type: JavaExec) {
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.addAll(konanJvmArgs) jvmArgs = konanJvmArgs
args = [*konanArgs, args = [*konanArgs,
'-output', project(':runtime').file("build/${target}Stdlib"), '-output', project(':runtime').file("build/${target}Stdlib"),
'-produce', 'library', '-produce', 'library',
@@ -191,7 +191,7 @@ targetList.each { target ->
task("${target}Start", type: JavaExec) { task("${target}Start", type: JavaExec) {
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(*jvmArgs) jvmArgs = konanJvmArgs
args = [*konanArgs, '-produce', 'bitcode', args = [*konanArgs, '-produce', 'bitcode',
'-output', project(':runtime').file("build/${target}Start"), '-output', project(':runtime').file("build/${target}Start"),
'-library', project(':runtime').file("build/${target}Stdlib"), '-library', project(':runtime').file("build/${target}Stdlib"),