summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-02-05 18:05:26 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-02-05 18:05:26 +0100
commit843c350ccae0a08db47ce899f5f9f681b2241cd4 (patch)
tree9a4bf816e6c9cb4dc0e80cabc2acd292880b8afe
parentf427d2f0d35f27273e856871f8588652632d8ac2 (diff)
parent656bc22e283852a55ad1317048649f0991bc7dcd (diff)
downloadredot-engine-843c350ccae0a08db47ce899f5f9f681b2241cd4.tar.gz
Merge pull request #87956 from adamscott/fix-emscripten-lto-build
Add workaround for emscripten >= 3.1.47 LTO build
-rw-r--r--platform/web/detect.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/web/detect.py b/platform/web/detect.py
index bce03eb79e..a1920acf6f 100644
--- a/platform/web/detect.py
+++ b/platform/web/detect.py
@@ -229,6 +229,9 @@ def configure(env: "Environment"):
# Workaround https://github.com/emscripten-core/emscripten/issues/19781.
if cc_semver >= (3, 1, 42) and cc_semver < (3, 1, 46):
env.Append(LINKFLAGS=["-Wl,-u,scalbnf"])
+ # Workaround https://github.com/emscripten-core/emscripten/issues/16836.
+ if cc_semver >= (3, 1, 47):
+ env.Append(LINKFLAGS=["-Wl,-u,_emscripten_run_callback_on_thread"])
if env["dlink_enabled"]:
if env["proxy_to_pthread"]: