From 326a098dac29392e6e2422555a89c91652432ef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 30 Jan 2024 14:54:15 +0100 Subject: [PATCH] SCons: Fix Web build when compiler version isn't properly detected Quick fix for #82585. A better fix requires refactoring the way we detect the compiler version to make it more reliable, and get a consistent output. But I prefer to keep changes minimal for 3.x branches at this point. Also set CI version to 3.1.39, which is what we use for official 3.6 builds since 3.6-beta4. --- .github/workflows/javascript_builds.yml | 2 +- platform/javascript/detect.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml index c3fba3d5f..dc3d43463 100644 --- a/.github/workflows/javascript_builds.yml +++ b/.github/workflows/javascript_builds.yml @@ -5,7 +5,7 @@ on: [push, pull_request] env: PANDEMONIUM_BASE_BRANCH: master SCONSFLAGS: verbose=yes warnings=all debug_symbols=no werror=yes - EM_VERSION: 3.1.45 + EM_VERSION: 3.1.39 EM_CACHE_FOLDER: "emsdk-cache" concurrency: diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 175994218..ffaf681c9 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -170,7 +170,7 @@ def configure(env): env["LIBSUFFIXES"] = ["$LIBSUFFIX"] # Get version info for checks below. - cc_semver = tuple(get_compiler_version(env)) + cc_semver = tuple(get_compiler_version(env) or (3, 1, 39)) env.Prepend(CPPPATH=["#platform/javascript"]) env.Append(CPPDEFINES=["JAVASCRIPT_ENABLED", "UNIX_ENABLED"])