Merge remote branch 'origin/master'

2011-12-30 16:32:36 +02:00
parent c87987db8e c2dc189bec
commit 42c9b08174
1 changed files with 4 additions and 1 deletions
@@ -233,7 +233,10 @@ public class CompileEnvironment {

    public ClassFileFactory compileModule(IModuleBuilder moduleBuilder, String directory) {
        CompileSession moduleCompileSession = new CompileSession(myEnvironment);
-        moduleCompileSession.addStdLibSources(false);
+        if (!"stdlib".equals(moduleBuilder.getModuleName())) {
+            moduleCompileSession.addStdLibSources(false);
+        }
+
        for (String sourceFile : moduleBuilder.getSourceFiles()) {
            File source = new File(sourceFile);
            if (!source.isAbsolute()) {