diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml index 5bed2812149..bc1237ace64 100644 --- a/.github/workflows/javascript_builds.yml +++ b/.github/workflows/javascript_builds.yml @@ -7,7 +7,7 @@ env: # Only used for the cache key. Increment version to force clean build. GODOT_BASE_BRANCH: 3.x SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no - EM_VERSION: 3.1.18 + EM_VERSION: 3.1.45 EM_CACHE_FOLDER: "emsdk-cache" concurrency: @@ -16,7 +16,7 @@ concurrency: jobs: javascript-template: - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" name: Template (target=release, tools=no) steps: diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index b32133e3326..046f0c53e11 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -111,6 +111,10 @@ def configure(env): else: env.Append(CCFLAGS=["-flto"]) env.Append(LINKFLAGS=["-flto"]) + # Workaround https://github.com/emscripten-core/emscripten/issues/19781. + cc_semver = tuple(get_compiler_version(env)) + if cc_semver >= (3, 1, 42): + env.Append(LINKFLAGS=["-Wl,-u,scalbnf"]) # Sanitizers if env["use_ubsan"]: