From e7bed58ebe142bb780be741ab2220d841c678942 Mon Sep 17 00:00:00 2001
From: Ilmir Usmanov <ilmir.usmanov@jetbrains.com>
Date: Thu, 27 Sep 2018 16:00:54 +0300
Subject: [PATCH] Fix bootstrap

---
 core/builtins/build.gradle.kts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/builtins/build.gradle.kts b/core/builtins/build.gradle.kts
index f2b8bb61373..45ce4808a06 100644
--- a/core/builtins/build.gradle.kts
+++ b/core/builtins/build.gradle.kts
@@ -1,5 +1,3 @@
-
-import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer
 import org.gradle.jvm.tasks.Jar
 import java.io.File
 
@@ -10,17 +8,17 @@ val builtinsSerialized = File(rootProject.extra["distDir"].toString(), "builtins
 
 val builtins by configurations.creating
 
-val serialize = task("serialize") {
+val serialize = task<Exec>("serialize") {
     val outDir = builtinsSerialized
     val inDirs = arrayOf(builtinsSrc, builtinsNative)
     outputs.dir(outDir)
     inputs.files(*inDirs)
-    doLast {
-        BuiltInsSerializer(dependOnOldBuiltIns = false)
-                .serialize(outDir, inDirs.asList(), listOf()) { totalSize, totalFiles ->
-                    println("Total bytes written: $totalSize to $totalFiles files")
-                }
-    }
+    commandLine(
+        "java", "-cp",
+        rootProject.buildscript.configurations["bootstrapCompilerClasspath"].asPath,
+        "org.jetbrains.kotlin.serialization.builtins.RunKt",
+        "$outDir", *inDirs
+    )
 }
 
 val builtinsJar by task<Jar> {