Merge branch 'master' into fzhinkin/kc-dev-jun-24-merge

Author: fzhinkin

integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt

@@ -53,16 +53,19 @@ private val kotlin_warnings_settings = System.getProperty("kotlin_Werror_overrid
 } ?: false
 
 private val kotlin_additional_cli_options = System.getProperty("kotlin_additional_cli_options")?.let {
-    val args = it.split(' ').map(String::trim).filter(String::isNotBlank)
-        .joinToString(prefix = "\"", separator = "\", \"", postfix = "\"") { opt ->
+    val argsList = it.split(' ').map(String::trim).filter(String::isNotBlank)
+    if (argsList.isEmpty()) {
+        ""
+    } else {
+        argsList.joinToString(prefix = "\"", separator = "\", \"", postfix = "\"") { opt ->
             opt.replace("\\", "\\\\")
                 .replace("\n", "\\n")
                 .replace("\t", "\\t")
                 .replace("\b", "\\b")
                 .replace("\r", "\\r")
                 .replace("\"", "\\\"")
         }
-    "freeCompilerArgs.addAll($args)"
+    }
 } ?: ""
 
 private fun generateBuildScript(kotlinVersion: String, jvmToolchain: Int) =