forward CLOSURE_COMPILER to settings, and use that to avoid a closure-specific workaround for Module detection; fixes #2209

1 files changed, 4 insertions, 3 deletions

diff --git a/emcc b/emcc
index de782071..0454b3b8 100755
--- a/emcc
+++ b/emcc
@@ -1034,9 +1034,6 @@ try:
 
   if DEBUG: start_time = time.time() # done after parsing arguments, which might affect debug state
 
-  if closure:
-    assert os.path.exists(shared.CLOSURE_COMPILER), logging.error('fatal: Closure compiler (%s) does not exist', shared.CLOSURE_COMPILER)
-
   for i in range(len(newargs)):
     if newargs[i] == '-s':
       if is_minus_s_for_emcc(newargs, i):
@@ -1252,6 +1249,10 @@ try:
     logging.warning('disabling closure because debug info was requested')
     closure = False
 
+  if closure:
+    shared.Settings.CLOSURE_COMPILER = 1
+    assert os.path.exists(shared.CLOSURE_COMPILER), logging.error('fatal: Closure compiler (%s) does not exist', shared.CLOSURE_COMPILER)
+
   assert shared.LLVM_TARGET in shared.COMPILER_OPTS
   if shared.LLVM_TARGET == 'i386-pc-linux-gnu':
     shared.Settings.TARGET_X86 = 1