From 6122cf3178f4bf1dec532ec337e7c5a28491572f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 5 Sep 2023 14:56:53 +0200 Subject: [PATCH] Web: Workaround Emscripten 3.1.42+ LTO regression Fixes #80010. (cherry picked from commit b064008c07be856d6f3a5079d11746137e03ede5) --- .github/workflows/web_builds.yml | 4 ++-- platform/web/detect.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml index 9da1f66fd82..57f1822f558 100644 --- a/.github/workflows/web_builds.yml +++ b/.github/workflows/web_builds.yml @@ -7,7 +7,7 @@ env: # Used for the cache key. Add version suffix to force clean build. GODOT_BASE_BRANCH: '4.1' SCONSFLAGS: verbose=yes warnings=extra 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: web-template: - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" name: Template (target=template_release) steps: diff --git a/platform/web/detect.py b/platform/web/detect.py index 2685cbcd63e..2a976e9810f 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -121,6 +121,11 @@ def configure(env: "Environment"): else: env.Append(CCFLAGS=["-flto"]) env.Append(LINKFLAGS=["-flto"]) + # Workaround https://github.com/emscripten-core/emscripten/issues/19781. + cc_version = get_compiler_version(env) + cc_semver = (int(cc_version["major"]), int(cc_version["minor"]), int(cc_version["patch"])) + if cc_semver >= (3, 1, 42): + env.Append(LINKFLAGS=["-Wl,-u,scalbnf"]) # Sanitizers if env["use_ubsan"]: