From ab8979c6144f25802fb4cecc4ae3a35c602be361 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Fri, 7 Nov 2014 16:34:25 +0300
Subject: [PATCH] Revert "Workaround for bootstrapping with changes in
 kotlin2js ant task and cli compiler."

This reverts commit a5b928782b0c70e173094a3a5d7850be33bad144.
---
 build.xml | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index 63923acbcf7..731d283ff24 100644
--- a/build.xml
+++ b/build.xml
@@ -221,26 +221,12 @@
         <property name="compiled.stdlib.js" value="stdlib.js" />
         <property name="stdlib.js.dir" value="${basedir}/js/js.translator/testData" />
 
-        <!-- TODO drop workaround for bootstrapping -->
-        <if>
-            <istrue value="${bootstrap.build.no.tests}"/>
-            <then>
-                <kotlin2js output="${output}/${compiled.stdlib.js}" main="noCall">
-                    <src>
-                        <fileset refid="kotlin.builtin.files" />
-                        <resources refid="js.lib.files" />
-                    </src>
-                </kotlin2js>
-            </then>
-            <else>
-                <kotlin2js output="${output}/${compiled.stdlib.js}" noStdlib="true" main="noCall">
-                    <src>
-                        <fileset refid="kotlin.builtin.files" />
-                        <resources refid="js.lib.files" />
-                    </src>
-                </kotlin2js>
-            </else>
-        </if>
+        <kotlin2js output="${output}/${compiled.stdlib.js}" noStdlib="true" main="noCall">
+            <src>
+                <fileset refid="kotlin.builtin.files" />
+                <resources refid="js.lib.files" />
+            </src>
+        </kotlin2js>
 
         <jar jarfile="${kotlin-home}/lib/kotlin-jslib.jar">
             <resources refid="js.lib.files" />