Merge remote branch 'origin/master'

2011-12-30 17:01:52 +02:00
parent 169e8520ef db7e2b0871
commit 3059aba110
1 changed files with 1 additions and 0 deletions
@@ -247,6 +247,7 @@ public class CompileEnvironment {
            moduleCompileSession.addSources(source.getPath());
        }
        for (String classpathRoot : moduleBuilder.getClasspathRoots()) {
+            if (classpathRoot.contains("/stdlib/") || classpathRoot.contains("\\stdlib\\")) continue; // TODO: We have source-level dependency on stdlib for now
            myEnvironment.addToClasspath(new File(classpathRoot));
        }
        if (!moduleCompileSession.analyze(myErrorStream)) {