From 19e706b1a3e491d0deb0dca07969662715bed361 Mon Sep 17 00:00:00 2001 From: Alexander Gorshenev Date: Mon, 20 Jan 2020 16:23:19 +0300 Subject: [PATCH] Properly construct stdlib with components. (cherry picked from commit 49ac790fcf1fc4dd590f79d1b591e7599f3c0ca3) --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 79764cc43b7..b98b5cae865 100644 --- a/build.gradle +++ b/build.gradle @@ -436,6 +436,10 @@ targetList.each { target -> destinationDir distDir + from(project(':runtime').file("build/${target}Stdlib")) { + include('**') + into(stdlib) + } from(project(':runtime').file("build/$target")) { include("runtime.bc") into("$stdlibDefaultComponent/targets/$target/native") @@ -445,10 +449,6 @@ targetList.each { target -> exclude("runtime.bc") into("konan/targets/$target/native") } - from(project(':runtime').file("build/${target}Stdlib")) { - include('**') - into(stdlibDefaultComponent) - } if (target == 'wasm32') { into("$stdlibDefaultComponent/targets/wasm32/included") { from(project(':runtime').file('src/main/js'))