From c1ad88f1a68ed10536629caf1c6724175cfaa3d4 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Mon, 18 Oct 2021 22:52:39 +0300
Subject: [PATCH] [K/N][build] Move stdlib bitcode copy to runtime

---
 kotlin-native/build.gradle             | 14 +-------------
 kotlin-native/runtime/build.gradle.kts |  5 +++++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle
index 175a72aad81..08fd532faab 100644
--- a/kotlin-native/build.gradle
+++ b/kotlin-native/build.gradle
@@ -400,23 +400,11 @@ def endorsedLibsCopyTask = task("crossDistEndorsedLibrariesCopy", type: Copy) {
 }
 
 targetList.each { target ->
-    task("${target}CopyStdlibRuntimeBitcode", type: Copy) {
+    task("${target}CrossDistStdlib", type: Copy) {
         dependsOn ":kotlin-native:runtime:${target}Stdlib"
 
-        destinationDir project(':kotlin-native:runtime')
-                .file("build/${target}Stdlib/default")
-
-        from(project(':kotlin-native:runtime').file("build/bitcode/main/$target")) {
-            include("runtime.bc")
-            into("targets/$target/native")
-        }
-    }
-
-    task ("${target}CrossDistStdlib", type: Copy) {
         destinationDir project.file("$distDir/$stdlib")
 
-        dependsOn ":kotlin-native:${target}CopyStdlibRuntimeBitcode"
-
         from(project(':kotlin-native:runtime').file("build/${target}Stdlib")) {
             include('**')
             eachFile {
diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index 18be74991ee..dd438af15ea 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -451,7 +451,12 @@ targetList.forEach { targetName ->
         dependsOn("${targetName}Runtime")
 
         destinationDir = project.buildDir.resolve("${targetName}Stdlib")
+
         from(project.buildDir.resolve("stdlib/${hostName}/stdlib"))
+        from(project.buildDir.resolve("bitcode/main/$targetName")) {
+            include("runtime.bc")
+            into("default/targets/$targetName/native")
+        }
 
         if (targetName != hostName) {
             doLast {