From 58b706c12e78943e543721d0450baf1528bb0733 Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Tue, 1 May 2012 21:22:06 +0400 Subject: [PATCH] Revert "kotlin runtime must be added to classpath" temporarily This reverts commit 90910cae3487311103e1792fb812e9d86b347aa5. --- .../jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index f0ae060e20c..14e5111f06b 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -72,7 +72,9 @@ public class JetCoreEnvironment extends JavaCoreEnvironment { } } if (compilerSpecialMode.includeKotlinRuntime()) { - addToClasspath(compilerDependencies.getRuntimeJar()); + for (VirtualFile root : compilerDependencies.getRuntimeRoots()) { + addLibraryRoot(root); + } } JetStandardLibrary.initialize(getProject());