Fix FIR bootstrap in version 2.0

2022-12-28 16:15:03 +01:00
parent bbeae23b04
commit 13502abab9
4 changed files with 31 additions and 17 deletions
@@ -172,14 +172,18 @@ fun Project.configureKotlinCompilationOptions() {
            kotlinOptions {
                freeCompilerArgs += jvmCompilerArgs

-                if (useJvmFir && project.path !in projectsWithDisabledFirBootstrap) {
-                    freeCompilerArgs += "-Xuse-k2"
-                    freeCompilerArgs += "-Xabi-stability=stable"
-                    if (useFirLT) {
-                        freeCompilerArgs += "-Xuse-fir-lt"
-                    }
-                    if (useFirIC) {
-                        freeCompilerArgs += "-Xuse-fir-ic"
+                if (useJvmFir) {
+                    if (project.path !in projectsWithDisabledFirBootstrap) {
+                        freeCompilerArgs += "-Xuse-k2"
+                        freeCompilerArgs += "-Xabi-stability=stable"
+                        if (useFirLT) {
+                            freeCompilerArgs += "-Xuse-fir-lt"
+                        }
+                        if (useFirIC) {
+                            freeCompilerArgs += "-Xuse-fir-ic"
+                        }
+                    } else {
+                        freeCompilerArgs += "-Xskip-prerelease-check"
                    }
                }
                if (renderDiagnosticNames) {