From 4a32993cc3632017ced71fdf147c7ce1129e7183 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 16 Sep 2015 22:33:30 +0300
Subject: [PATCH] Ant build: apply -Xmultifile-package-facades while building
 stdlib and reflection jars only

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

diff --git a/build.xml b/build.xml
index 6fcfa7e9bda..af9a93d0156 100644
--- a/build.xml
+++ b/build.xml
@@ -671,6 +671,7 @@
     <macrodef name="new-kotlinc">
         <attribute name="output"/>
         <attribute name="moduleName"/>
+        <attribute name="additionalOptions" default=""/>
         <element name="src"/>
         <element name="class-path"/>
 
@@ -703,7 +704,7 @@
                 <arg value="-d"/>
                 <arg value="@{output}"/>
                 <arg value="-no-stdlib"/>
-                <arg value="-Xmultifile-package-facades"/>
+                <arg line="@{additionalOptions}"/>
                 <arg value="-classpath"/>
                 <arg value="${toString:classpath.path}"/>
                 <arg value="-module-name"/>
@@ -736,7 +737,7 @@
     </target>
 
     <target name="stdlib">
-        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib">
+        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib" additionalOptions="-Xmultifile-package-facades">
             <src>
                 <include name="libraries/stdlib/src"/>
             </src>
@@ -765,7 +766,7 @@
     </target>
 
     <target name="reflection">
-        <new-kotlinc output="${output}/classes/reflection" moduleName="kotlin-reflection">
+        <new-kotlinc output="${output}/classes/reflection" moduleName="kotlin-reflection" additionalOptions="-Xmultifile-package-facades">
             <src>
                 <include name="core/reflection.jvm/src"/>
             </src>