Correct compiler initialization, ensuring defines are set properly

niloc132 · Nov 26, 2023 · 7408030 · 7408030
1 parent ff24edd
commit 7408030
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/Closure.java b/j2cl-tasks/src/main/java/com/vertispan/j2cl/tools/Closure.java
@@ -9,6 +9,7 @@
 
 import javax.annotation.Nullable;
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -202,7 +203,6 @@ static class InProcessJsCompRunner extends CommandLineRunner {
             super(args);
             this.compiler = compiler;
             this.compiler.setErrorManager(new SortingErrorManager(Collections.singleton(new LoggingErrorReportGenerator(compiler, log))));
-            this.compiler.setPassConfig(new ServiceLoadingPassConfig(createOptions()));
             this.exportTestFunctions = exportTestFunctions;
             this.checkAssertions = checkAssertions;
             setExitCodeReceiver(exitCode -> {
@@ -228,6 +228,12 @@ protected CompilerOptions createOptions() {
 
             return options;
         }
+
+        @Override
+        protected void setRunOptions(CompilerOptions options) throws IOException {
+            super.setRunOptions(options);
+            this.compiler.setPassConfig(new ServiceLoadingPassConfig(options));
+        }
     }