From 65fa2f62bdd69bffb8e72607247b4c7330206119 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <Svyatoslav.Scherbina@jetbrains.com>
Date: Fri, 2 Apr 2021 14:13:48 +0000
Subject: [PATCH] Fix :kotlin-native:**:nativelibs Gradle tasks

These tasks did copy all files from build to build/nativelibs, thus
causing up-to-date checks to fail, and native libs and temporary build
files to be accumulated in recursive directories like
nativelibs/nativelibs/... in both build dirs and dist.

Fix this by copying only relevant files.
---
 kotlin-native/Interop/Indexer/build.gradle.kts | 5 +++--
 kotlin-native/Interop/Runtime/build.gradle.kts | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kotlin-native/Interop/Indexer/build.gradle.kts b/kotlin-native/Interop/Indexer/build.gradle.kts
index 8c84f87a824..89291021001 100644
--- a/kotlin-native/Interop/Indexer/build.gradle.kts
+++ b/kotlin-native/Interop/Indexer/build.gradle.kts
@@ -144,9 +144,10 @@ dependencies {
 }
 
 val nativelibs = project.tasks.create<Copy>("nativelibs") {
-    dependsOn(solib("clangstubs"))
+    val clangstubsSolib = solib("clangstubs")
+    dependsOn(clangstubsSolib)
 
-    from("$buildDir/")
+    from("$buildDir/$clangstubsSolib")
     into("$buildDir/nativelibs/")
 }
 
diff --git a/kotlin-native/Interop/Runtime/build.gradle.kts b/kotlin-native/Interop/Runtime/build.gradle.kts
index 45c6a9d5ab5..516a08347ee 100644
--- a/kotlin-native/Interop/Runtime/build.gradle.kts
+++ b/kotlin-native/Interop/Runtime/build.gradle.kts
@@ -86,8 +86,9 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach
 
 
 val nativelibs = project.tasks.create<Copy>("nativelibs") {
-    dependsOn(solib("callbacks"))
+    val callbacksSolib = solib("callbacks")
+    dependsOn(callbacksSolib)
 
-    from("$buildDir/")
+    from("$buildDir/$callbacksSolib")
     into("$buildDir/nativelibs/")
 }