commit 20d0b8ff2b9434f90f0408b1263996b1bd773abc
author Nikita Bobko <nikita.bobko@jetbrains.com> Tue Sep 17 15:10:54 2024 +0200
committer Nikita Bobko <nikita.bobko@jetbrains.com> Wed Sep 18 12:20:23 2024 +0200
tree f4c6a72d0abb84aa8c204d27de205b1339e476e8
parent bc02ee8355796cf0cfa41b8ab4ab7da465dc069c

[stdlib, build] Make stdlib Wasm and Native compilation respect 'kotlin.build.disable.werror'

Motivation: now it's easier to do impact estimations on bootstrapped
Kotlin repo if warning diagnostics are used to log data to build log.
It's easier because warnings in stdlib won't fail the compilation.

kotlin-native/runtime/build.gradle.kts

diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts
index 0c38b14..24b146e 100644
--- a/kotlin-native/runtime/build.gradle.kts
+++ b/kotlin-native/runtime/build.gradle.kts
@@ -568,11 +568,11 @@
             layout.buildDirectory.dir("stdlib/${HostManager.hostName}/stdlib")
     )
 
-    this.extraOpts.addAll(
+    this.extraOpts.addAll(listOfNotNull(
             "-no-default-libs",
             "-no-endorsed-libs",
             "-nostdlib",
-            "-Werror",
+            "-Werror".takeIf { !kotlinBuildProperties.disableWerror },
             "-Xallow-kotlin-package",
             "-Xexplicit-api=strict",
             "-Xexpect-actual-classes",
@@ -588,7 +588,7 @@
             "-Xdont-warn-on-error-suppression",
             "-Xstdlib-compilation",
             "-Xfragment-refines=nativeMain:nativeWasm,nativeMain:common,nativeWasm:common",
-    )
+    ))
 
     val common by sourceSets.creating {
         srcDir(project(":kotlin-stdlib").file("common/src/kotlin"))

libraries/stdlib/build.gradle.kts

diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts
index d45fa5c..1b2e514 100644
--- a/libraries/stdlib/build.gradle.kts
+++ b/libraries/stdlib/build.gradle.kts
@@ -249,9 +249,7 @@
                         diagnosticNamesArg,
                     )
 
-                    if (!kotlinBuildProperties.disableWerror) {
-                        allWarningsAsErrors = true
-                    }
+                    if (!kotlinBuildProperties.disableWerror) allWarningsAsErrors = true
                 }
                 compileTaskProvider.configure {
                     compilerOptions.mainCompilationOptions()
@@ -276,7 +274,7 @@
             @Suppress("DEPRECATION")
             val main by getting {
                 kotlinOptions.freeCompilerArgs += "-Xir-module-name=$KOTLIN_WASM_STDLIB_NAME"
-                kotlinOptions.allWarningsAsErrors = true
+                if (!kotlinBuildProperties.disableWerror) kotlinOptions.allWarningsAsErrors = true
                 compileTaskProvider.configure {
                     compilerOptions.mainCompilationOptions()
                 }