From 7153ea61d820eb3da0a3c99814f255fa0e510164 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 7 Jun 2016 18:41:36 +0200
Subject: [PATCH] Restore logic of StandardScriptDefinition handling, fixes
 codegen tests

---
 .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt     | 2 ++
 .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt          | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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<K2JVMCompilerArguments>() {
             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 {