diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-18 16:32:13 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-18 16:32:20 +0200 |
commit | 50161808c240b2296045887e1fc683eee87905ae (patch) | |
tree | 5024126bce7c6a174f8d41ddc20c92fe8fc0bad0 /platform/web | |
parent | e3e2528ba7f6e85ac167d687dd6312b35f558591 (diff) | |
download | redot-engine-50161808c240b2296045887e1fc683eee87905ae.tar.gz |
Web: Fix version check for missing scalbnf LTO workaround
The check needs to happen after we set `env["CXX"]`.
Follow-up to #81340.
Diffstat (limited to 'platform/web')
-rw-r--r-- | platform/web/detect.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/platform/web/detect.py b/platform/web/detect.py index 7b2e5646d6..3e2bb5cd30 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -118,11 +118,6 @@ 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"]: @@ -204,9 +199,16 @@ def configure(env: "Environment"): env.Append(LINKFLAGS=["-s", "PTHREAD_POOL_SIZE=8"]) env.Append(LINKFLAGS=["-s", "WASM_MEM_MAX=2048MB"]) + # Get version info for checks below. + cc_version = get_compiler_version(env) + cc_semver = (int(cc_version["major"]), int(cc_version["minor"]), int(cc_version["patch"])) + + if env["lto"] != "none": + # 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["dlink_enabled"]: - 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, 14): print("GDExtension support requires emscripten >= 3.1.14, detected: %s.%s.%s" % cc_semver) sys.exit(255) |