Merge remote branch 'origin/master'

This commit is contained in:
Alex Tkachman
2011-12-30 17:01:52 +02:00
@@ -247,6 +247,7 @@ public class CompileEnvironment {
moduleCompileSession.addSources(source.getPath()); moduleCompileSession.addSources(source.getPath());
} }
for (String classpathRoot : moduleBuilder.getClasspathRoots()) { 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)); myEnvironment.addToClasspath(new File(classpathRoot));
} }
if (!moduleCompileSession.analyze(myErrorStream)) { if (!moduleCompileSession.analyze(myErrorStream)) {