diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt index 01cdf9cef1a..196d998e788 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTargetConfigurator.kt @@ -122,7 +122,7 @@ open class KotlinNativeTargetConfigurator( group = BasePlugin.BUILD_GROUP description = "Links ${binary.outputKind.description} '${binary.name}' for a target '${target.name}'." enabled = binary.konanTarget.enabledOnCurrentHost - destinationDir = binary.outputDirectory + addCompilerPlugins() if (binary !is TestExecutable) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt index 1e7e84c104b..7844e1d2074 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/NativeBinaries.kt @@ -83,7 +83,7 @@ sealed class NativeBinary( // Output access. // TODO: Provide output configurations and integrate them with Gradle Native. - val outputDirectory: File = with(project) { + var outputDirectory: File = with(project) { val targetSubDirectory = target.disambiguationClassifier?.let { "$it/" }.orEmpty() buildDir.resolve("bin/$targetSubDirectory${this@NativeBinary.name}") } 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 3d6066b0d47..e2928fe0712 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 @@ -425,6 +425,15 @@ open class KotlinNativeLink : AbstractKotlinNativeCompile