diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 76015bd38a0..659d1b35292 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -115,6 +115,8 @@ class K2JVMCompiler : CLICompiler() { return ExitCode.OK } + configuration.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, StandardScriptDefinition) + if (arguments.skipMetadataVersionCheck) { JvmMetadataVersion.skipCheck = true } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 73d707b142d..872cb808f98 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -143,10 +143,10 @@ class KotlinCoreEnvironment private constructor( if (configuration.get(JVMConfigurationKeys.LOAD_SCRIPT_CONFIGS) ?: false) loadScriptConfigsFromProjectRoot(File(project.basePath ?: ".")).let { configs -> val kotlinEnvVars = generateKotlinScriptClasspathEnvVars(project) - configs.map { KotlinConfigurableScriptDefinition(it, kotlinEnvVars) } + StandardScriptDefinition + configs.map { KotlinConfigurableScriptDefinition(it, kotlinEnvVars) } } else null - ?: listOf(StandardScriptDefinition) + ?: emptyList() }) KotlinScriptExtraImportsProvider.getInstance(project)?.run {