azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly construct stdlib with components.

Browse Source 
(cherry picked from commit 49ac790fcf1fc4dd590f79d1b591e7599f3c0ca3)
This commit is contained in:
Alexander Gorshenev
2020-01-20 16:23:19 +03:00
committed by Vasily Levchenko
parent b4882103bc
commit 19e706b1a3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+4 -4
View File
@@ -436,6 +436,10 @@ targetList.each { target ->
destinationDir distDir destinationDir distDir
from(project(':runtime').file("build/${target}Stdlib")) {
include('**')
into(stdlib)
}
from(project(':runtime').file("build/$target")) { from(project(':runtime').file("build/$target")) {
include("runtime.bc") include("runtime.bc")
into("$stdlibDefaultComponent/targets/$target/native") into("$stdlibDefaultComponent/targets/$target/native")
@@ -445,10 +449,6 @@ targetList.each { target ->
exclude("runtime.bc") exclude("runtime.bc")
into("konan/targets/$target/native") into("konan/targets/$target/native")
} }
from(project(':runtime').file("build/${target}Stdlib")) {
include('**')
into(stdlibDefaultComponent)
}
if (target == 'wasm32') { if (target == 'wasm32') {
into("$stdlibDefaultComponent/targets/wasm32/included") { into("$stdlibDefaultComponent/targets/wasm32/included") {
from(project(':runtime').file('src/main/js')) from(project(':runtime').file('src/main/js'))