From 55595fe2c6b23bd731f4e543c01f7b0b9da93143 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 16 Jun 2020 19:59:07 +0300 Subject: [PATCH] Make sure that commonizer is enabled before adding -no-default-libs argument ^KT-39632 Fixed --- .../kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt index 1a0ae26875c..d14fe70a591 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/KotlinNativeTasks.kt @@ -24,8 +24,10 @@ import org.jetbrains.kotlin.gradle.dsl.NativeCacheKind import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder import org.jetbrains.kotlin.gradle.plugin.cocoapods.asValidFrameworkName +import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.sources.DefaultLanguageSettingsBuilder +import org.jetbrains.kotlin.gradle.targets.native.internal.isAllowCommonizer import org.jetbrains.kotlin.gradle.utils.getValue import org.jetbrains.kotlin.gradle.utils.klibModuleName import org.jetbrains.kotlin.konan.library.KLIB_INTEROP_IR_PROVIDER_IDENTIFIER @@ -272,7 +274,7 @@ abstract class AbstractKotlinNativeCompile : Abstra add("-Xexpect-actual-linker") add("-Xmetadata-klib") addArg("-manifest", manifestFile.get().absolutePath) - add("-no-default-libs") + if (project.isAllowCommonizer()) add("-no-default-libs") } addArg("-o", outputFile.get().absolutePath)