From b68fee9cbc3167c66b1dd8687c636021f763f249 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 15 Mar 2021 16:32:01 +0100 Subject: [PATCH] CliCommonizer: Guard input- and dependency- libraries --- .../kotlin/descriptors/commonizer/CliCommonizer.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt b/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt index bee9c28084f..361452e56f8 100644 --- a/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt +++ b/native/commonizer-api/src/org/jetbrains/kotlin/descriptors/commonizer/CliCommonizer.kt @@ -7,7 +7,6 @@ package org.jetbrains.kotlin.descriptors.commonizer import java.io.File import java.net.URLClassLoader -import kotlin.jvm.Throws public fun CliCommonizer(classpath: Iterable): CliCommonizer { return CliCommonizer(URLClassLoader(classpath.map { it.absoluteFile.toURI().toURL() }.toTypedArray())) @@ -30,13 +29,16 @@ public class CliCommonizer(private val executor: Executor) : Commonizer { outputCommonizerTarget: SharedCommonizerTarget, outputDirectory: File ) { + if (inputLibraries.isEmpty()) return val arguments = mutableListOf().apply { add("native-klib-commonize") add("-distribution-path"); add(konanHome.absolutePath) add("-input-libraries"); add(inputLibraries.joinToString(";") { it.absolutePath }) - add("-dependency-libraries"); add(dependencyLibraries.joinToString(";") { it.absolutePath }) add("-output-commonizer-target"); add(outputCommonizerTarget.identityString) add("-output-path"); add(outputDirectory.absolutePath) + if (dependencyLibraries.isNotEmpty()) { + add("-dependency-libraries"); add(dependencyLibraries.joinToString(";") { it.absolutePath }) + } } executor(arguments) }