Skip to content

Commit ac48964

Browse files
authored
Partial revert of #12139 (#12154)
This part of the change meant that we would generate an error if closure-compiler was missing whenever emcc was run, even if it was never used/needed. I have a planned followup to clean this up. Fixes the current emscripten roll into emscripten-releases.
1 parent c379056 commit ac48964

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tools/shared.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,11 @@ def normalize_config_settings():
444444
PORTS = os.path.join(CACHE, 'ports')
445445

446446
if CLOSURE_COMPILER is None:
447-
CLOSURE_COMPILER = get_npm_cmd('google-closure-compiler')
448-
if not WINDOWS:
447+
if WINDOWS:
448+
CLOSURE_COMPILER = [path_from_root('node_modules', '.bin', 'google-closure-compiler.cmd')]
449+
else:
449450
# Work around an issue that Closure compiler can take up a lot of memory and crash in an error
450-
# "FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory"
451+
# "FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory"
451452
CLOSURE_COMPILER = NODE_JS + ['--max_old_space_size=8192', path_from_root('node_modules', '.bin', 'google-closure-compiler')]
452453

453454
if JAVA is None:

0 commit comments

Comments
 (0)