diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 046f0c53e11..7d770d13942 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -111,10 +111,6 @@ 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"]: @@ -193,8 +189,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["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["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)