From dffdc262089e83b85c8c3ff085af571550fc8278 Mon Sep 17 00:00:00 2001
From: "konstantin.tskhovrebov" <konstantin.tskhovrebov@jetbrains.com>
Date: Fri, 30 Sep 2022 10:05:14 +0200
Subject: [PATCH] Fix gradle configuration cache in
 KotlinNativeLinkArtifactTask.

---
 .../native/tasks/artifact/KotlinNativeLinkArtifactTask.kt   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
index f7f5688cf07..d059d20a7a2 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/artifact/KotlinNativeLinkArtifactTask.kt
@@ -89,8 +89,10 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
     @get:Input
     abstract val binaryOptions: MapProperty<String, String>
 
+    private val nativeBinaryOptions = PropertiesProvider(project).nativeBinaryOptions
+
     @get:Input
-    internal val allBinaryOptions get() = PropertiesProvider(project).nativeBinaryOptions + binaryOptions.get()
+    internal val allBinaryOptions: Provider<Map<String, String>> = binaryOptions.map { it + nativeBinaryOptions }
 
     override val toolOptions: CompilerCommonToolOptions = objectFactory
         .newInstance<CompilerCommonToolOptionsDefault>()
@@ -205,7 +207,7 @@ abstract class KotlinNativeLinkArtifactTask @Inject constructor(
             entryPoint = entryPoint.getOrNull(),
             embedBitcode = embedBitcode.get(),
             linkerOpts = linkerOptions.get(),
-            binaryOptions = allBinaryOptions,
+            binaryOptions = allBinaryOptions.get(),
             isStaticFramework = staticFramework.get(),
             exportLibraries = exportLibraries.klibs(),
             includeLibraries = includeLibraries.klibs(),