Include FIR modules into compiler #KT-30243 Fixed

(cherry picked from commit 053aa8ca1e)
2019-04-19 19:49:50 +03:00
parent bd16c4629a
commit 3f6be95801
3 changed files with 18 additions and 36 deletions
@@ -113,17 +113,11 @@ extra["compilerModules"] = arrayOf(
    ":compiler:resolution",
    ":compiler:serialization",
    ":compiler:psi",
-    *if (project.findProperty("fir.enabled") == "true") {
-        arrayOf(
-            ":compiler:fir:cones",
-            ":compiler:fir:resolve",
-            ":compiler:fir:tree",
-            ":compiler:fir:psi2fir",
-            ":compiler:fir:fir2ir"
-        )
-    } else {
-        emptyArray()
-    },
+    ":compiler:fir:cones",
+    ":compiler:fir:resolve",
+    ":compiler:fir:tree",
+    ":compiler:fir:psi2fir",
+    ":compiler:fir:fir2ir",
    ":compiler:frontend",
    ":compiler:frontend.common",
    ":compiler:frontend.java",