From 2516583ecf999de5e5cd458fc95b2d4b76d95cfb Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <hotkeytlt@gmail.com>
Date: Thu, 2 Feb 2017 21:46:03 +0300
Subject: [PATCH] Fixed empty `-libraries` passed from Gradle plugin in CLI.

---
 .../main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index bb7b8ddabdb..25a503f08c3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -334,7 +334,11 @@ open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArguments>(),
                 .filter { LibraryUtils.isKotlinJavascriptLibrary(it) }
                 .map { it.canonicalPath }
 
-        args.libraries = (dependencies + friendDependency.orEmpty()).joinToString(File.pathSeparator)
+        args.libraries = (dependencies + listOfNotNull(friendDependency)).let {
+            if (it.isNotEmpty())
+                it.joinToString(File.pathSeparator) else
+                null
+        }
 
         kotlinOptionsImpl.updateArguments(args)
         return args