From bc6c8e980e6c1a31ce949cbaca2db015a32e91e2 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 20 Jul 2012 19:28:16 +0400
Subject: [PATCH] Module scripts are compiled in an environment with JDK &
 Annotations

---
 .../jet/cli/jvm/compiler/CompileEnvironmentUtil.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index 1ce68d4ba26..4d16ce98d06 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -142,7 +142,13 @@ public class CompileEnvironmentUtil {
             }
         };
         CompilerConfiguration configuration = new CompilerConfiguration();
-        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{PathUtil.getDefaultRuntimePath()});
+        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{
+                PathUtil.findRtJar(),
+                PathUtil.getDefaultRuntimePath()
+        });
+        configuration.putUserData(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File[]{
+                PathUtil.getJdkAnnotationsPath()
+        });
         JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration);
         scriptEnvironment.addSources(moduleScriptFile);