[build] Don't use full paths to specify platform lib dependencies

This commit is contained in:
Ilya Matveev
2018-01-16 13:32:33 +07:00
committed by ilmat192
parent 9eb00ddb94
commit 76bfb9322d
2 changed files with 7 additions and 3 deletions
+4
View File
@@ -312,6 +312,10 @@ targetList.each { target ->
task("${target}PlatformLibs") { task("${target}PlatformLibs") {
dependsOn ":platformLibs:${target}Install" dependsOn ":platformLibs:${target}Install"
} }
task("${target}CrossDist") {
dependsOn "${target}CrossDistRuntime", 'distCompiler', 'commonDistRuntime'
}
} }
task distPlatformLibs { task distPlatformLibs {
+3 -3
View File
@@ -20,7 +20,7 @@ buildscript {
} }
ext.konanHome = distDir.absolutePath ext.konanHome = distDir.absolutePath
ext.jvmArgs = project.findProperty("platformLibsJvmArgs") ?: "-Xmx6G" ext.jvmArgs = project.findProperty("platformLibsJvmArgs") ?: "-Xmx3G"
ext.setProperty("konan.home", konanHome) ext.setProperty("konan.home", konanHome)
ext.setProperty("konan.jvmArgs", jvmArgs) ext.setProperty("konan.jvmArgs", jvmArgs)
} }
@@ -65,7 +65,7 @@ targetList.each { target ->
artifactName df.name artifactName df.name
noDefaultLibs true noDefaultLibs true
libraries { libraries {
files df.config.depends.collect { "$konanHome/klib/platform/$target/$it" } klibs df.config.depends
} }
extraOpts '--purge_user_libs' extraOpts '--purge_user_libs'
} }
@@ -73,7 +73,7 @@ targetList.each { target ->
def libTask = konanArtifacts."$libName"."$target" def libTask = konanArtifacts."$libName"."$target"
libTask.dependsOn df.config.depends.collect{ defFileToLibName(target, it) } libTask.dependsOn df.config.depends.collect{ defFileToLibName(target, it) }
libTask.dependsOn ':cross_dist' libTask.dependsOn ":${target}CrossDist"
task "$libName"(type: KlibInstall) { task "$libName"(type: KlibInstall) {
klib = libTask.artifact klib = libTask.artifact