From cbe5dc40ef6e6fe0086743beda8a9ee904999613 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 26 Aug 2021 17:08:03 +0700
Subject: [PATCH] [Gradle] Improve UP-TO-DATE checks for K/N binary options

---
 .../gradle/targets/native/tasks/KotlinNativeTasks.kt       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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 3e946d3ab99..603028e3dd3 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
@@ -591,10 +591,7 @@ constructor(
         @Input get() = binary.linkerOpts
 
     val binaryOptions: Map<String, String>
-        @Input get() = binary.binaryOptions
-
-    val projectWideBinaryOptions: Map<String, String>
-        @Input get() = PropertiesProvider(project).nativeBinaryOptions
+        @Input get() = PropertiesProvider(project).nativeBinaryOptions + binary.binaryOptions
 
     val processTests: Boolean
         @Input get() = binary is TestExecutable
@@ -639,7 +636,7 @@ constructor(
         linkerOpts.forEach {
             addArg("-linker-option", it)
         }
-        (projectWideBinaryOptions + binaryOptions).forEach { (name, value) ->
+        binaryOptions.forEach { (name, value) ->
             add("-Xbinary=$name=$value")
         }
         exportLibraries.files.filterKlibsPassedToCompiler().forEach {