Download dependencies only in dist
Don't extract dependencies in dependencies/all, only in dist/dependencies Remove konan.dependencies property
This commit is contained in:
@@ -194,7 +194,6 @@ targetList.each { target ->
|
||||
classpath = project.configurations.cli_bc
|
||||
jvmArgs "-ea",
|
||||
"-Dkonan.home=${project.parent.file('dist')}",
|
||||
"-Dkonan.dependencies=${project.parent.file('dependencies/all')}",
|
||||
"-Djava.library.path=${project.buildDir}/nativelibs"
|
||||
args('-output', project(':runtime').file("build/${target}/stdlib.kt.bc"),
|
||||
'-nolink', '-nostdlib', '-ea',
|
||||
@@ -221,7 +220,6 @@ targetList.each { target ->
|
||||
classpath = project.configurations.cli_bc
|
||||
jvmArgs "-ea",
|
||||
"-Dkonan.home=${project.parent.file('dist')}",
|
||||
"-Dkonan.dependencies=${project.parent.file('dependencies/all')}",
|
||||
"-Djava.library.path=${project.buildDir}/nativelibs"
|
||||
args('-output', project(':runtime').file("build/${target}/start.kt.bc"),
|
||||
'-nolink', '-nostdlib', '-ea',
|
||||
|
||||
+1
-2
@@ -24,8 +24,7 @@ class Distribution(val config: CompilerConfiguration) {
|
||||
|
||||
val lib = "$konanHome/lib/$target"
|
||||
|
||||
// We can override dependency directory using konan.dependencies system property.
|
||||
val dependenciesDir = System.getProperty("konan.dependencies", "$konanHome/dependencies")
|
||||
val dependenciesDir = "$konanHome/dependencies"
|
||||
val dependencies = properties.propertyList("dependencies.$suffix")
|
||||
|
||||
val stdlib = "$lib/stdlib.kt.bc"
|
||||
|
||||
Reference in New Issue
Block a user