From 76bfb9322dea197537e38bbf2182b237307039a6 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 16 Jan 2018 13:32:33 +0700
Subject: [PATCH] [build] Don't use full paths to specify platform lib
 dependencies

---
 build.gradle              | 4 ++++
 platformLibs/build.gradle | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index c0777dcfc60..4b3b5c6f4c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -312,6 +312,10 @@ targetList.each { target ->
     task("${target}PlatformLibs") {
         dependsOn ":platformLibs:${target}Install"
     }
+
+    task("${target}CrossDist") {
+        dependsOn "${target}CrossDistRuntime", 'distCompiler', 'commonDistRuntime'
+    }
 }
 
 task distPlatformLibs {
diff --git a/platformLibs/build.gradle b/platformLibs/build.gradle
index c239be32c9b..b4a04727992 100644
--- a/platformLibs/build.gradle
+++ b/platformLibs/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     ext.konanHome = distDir.absolutePath
-    ext.jvmArgs = project.findProperty("platformLibsJvmArgs") ?: "-Xmx6G"
+    ext.jvmArgs = project.findProperty("platformLibsJvmArgs") ?: "-Xmx3G"
     ext.setProperty("konan.home", konanHome)
     ext.setProperty("konan.jvmArgs", jvmArgs)
 }
@@ -65,7 +65,7 @@ targetList.each { target ->
                 artifactName df.name
                 noDefaultLibs true
                 libraries {
-                    files df.config.depends.collect { "$konanHome/klib/platform/$target/$it" }
+                    klibs df.config.depends
                 }
                 extraOpts '--purge_user_libs'
             }
@@ -73,7 +73,7 @@ targetList.each { target ->
 
         def libTask = konanArtifacts."$libName"."$target"
         libTask.dependsOn df.config.depends.collect{ defFileToLibName(target, it) }
-        libTask.dependsOn ':cross_dist'
+        libTask.dependsOn ":${target}CrossDist"
 
         task "$libName"(type: KlibInstall) {
             klib = libTask.artifact