[K/N][build] Move stdlib bitcode copy to runtime

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 {

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 {