Skip to content

Commit 3011717

Browse files
committed
Remove custom --language-in arg for the Closure compiler
1 parent 2b7ea62 commit 3011717

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

platform/web/SCsub

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,12 @@ for lib in sys_env["JS_LIBS"]:
5959
sys_env.Append(LINKFLAGS=["--js-library", lib.abspath])
6060
for js in sys_env["JS_PRE"]:
6161
sys_env.Append(LINKFLAGS=["--pre-js", js.abspath])
62+
63+
# Add JS externs to Closure.
64+
sys_env["ENV"]["EMCC_CLOSURE_ARGS"] = sys_env["ENV"].get("EMCC_CLOSURE_ARGS", "")
6265
for ext in sys_env["JS_EXTERNS"]:
6366
sys_env["ENV"]["EMCC_CLOSURE_ARGS"] += " --externs " + ext.abspath
67+
sys_env["ENV"]["EMCC_CLOSURE_ARGS"] = sys_env["ENV"]["EMCC_CLOSURE_ARGS"].strip()
6468

6569
build = []
6670
build_targets = ["#bin/godot${PROGSUFFIX}.js", "#bin/godot${PROGSUFFIX}.wasm"]

platform/web/detect.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ def configure(env: "SConsEnvironment"):
166166
# Add method for creating the final zip file
167167
env.AddMethod(create_template_zip, "CreateTemplateZip")
168168

169-
# Closure compiler extern and support for ecmascript specs (const, let, etc).
170-
env["ENV"]["EMCC_CLOSURE_ARGS"] = "--language_in ECMASCRIPT_2021"
171-
172169
env["CC"] = "emcc"
173170
env["CXX"] = "em++"
174171

0 commit comments

Comments
 (0)