From 46bf057b4794d908bb3ee6388a0a42a8bedd5ed8 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 25 Jan 2017 15:09:37 +0300
Subject: [PATCH] JS: do not generate .meta.js and .kjsm for built-ins

---
 build.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 786bca41db7..49c13921700 100644
--- a/build.xml
+++ b/build.xml
@@ -314,6 +314,7 @@
 
     <macrodef name="new-kotlin2js">
         <attribute name="output"/>
+        <attribute name="additionalOptions" default=""/>
         <element name="src"/>
 
         <sequential>
@@ -341,8 +342,7 @@
                 <arg value="@{output}"/>
                 <arg value="-no-stdlib"/>
                 <arg value="-version"/>
-                <arg value="-meta-info"/>
-                <arg value="-kjsm"/>
+                <arg line="@{additionalOptions}"/>
                 <arg line="-main noCall"/>
                 <arg line="-module-kind commonjs"/>
                 <arg value="-Xallow-kotlin-package"/>
@@ -409,6 +409,7 @@
     <target name="js-stdlib">
         <property environment="env"/>
         <kotlin-pp src="libraries/stdlib/src" output="${intermediate-sources}/stdlib/js" profile="JS" />
+        <cleandir dir="${js.stdlib.output.dir}"/>
 
         <!-- We don't want descriptors for built-ins to be serialized, so we compile these files separately. -->
         <new-kotlin2js output="${js.stdlib.output.dir}/tmp-builtins/kotlin.js">
@@ -419,7 +420,7 @@
             </src>
         </new-kotlin2js>
 
-        <new-kotlin2js output="${js.stdlib.output.dir}/tmp/kotlin.js">
+        <new-kotlin2js output="${js.stdlib.output.dir}/tmp/kotlin.js" additionalOptions="-meta-info -kjsm">
             <src>
                 <union>
                     <fileset refid="kotlin.builtin.files"/>