godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Web: Fix version check for missing scalbnf LTO workaround

Browse Source 
The check needs to happen after we set `env["CXX"]`.
Follow-up to #81340.

(cherry picked from commit 50161808c2)
This commit is contained in:
Rémi Verschelde
2023-09-18 16:32:13 +02:00
parent 2d2a2aabc1
commit 1c125e6cc6
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
platform/javascript/detect.py
View File

@@ -108,12 +108,6 @@ def configure(env):
env.Append(CCFLAGS=["-flto=full"])
env.Append(LINKFLAGS=["-flto=full"])
if env["use_thinlto"] or env["use_lto"]:
# 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"]:
env.Append(CCFLAGS=["-fsanitize=undefined"])
@@ -191,8 +185,15 @@ def configure(env):
else:
env.Append(CPPDEFINES=["NO_THREADS"])
# Get version info for checks below.
cc_semver = tuple(get_compiler_version(env))
if env["use_thinlto"] or env["use_lto"]:
# 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"])
if env["gdnative_enabled"]:
cc_semver = tuple(get_compiler_version(env))
if cc_semver < (2, 0, 10):
print("GDNative support requires emscripten >= 2.0.10, detected: %s.%s.%s" % cc_semver)
sys.exit(255)