Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-07 12:31:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

SCons: Fix Web build when compiler version isn't properly detected

Browse Source 
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.
This commit is contained in:
Rémi Verschelde 2024-01-30 14:54:15 +01:00 committed by Relintai
parent 61645f36f3
commit 326a098dac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/javascript_builds.yml vendored
View File

@ -5,7 +5,7 @@ on: [push, pull_request]
env: env:
PANDEMONIUM_BASE_BRANCH: master PANDEMONIUM_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=all debug_symbols=no werror=yes 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" EM_CACHE_FOLDER: "emsdk-cache"
concurrency: concurrency:

2
platform/javascript/detect.py
View File

@ -170,7 +170,7 @@ def configure(env):
env["LIBSUFFIXES"] = ["$LIBSUFFIX"] env["LIBSUFFIXES"] = ["$LIBSUFFIX"]
# Get version info for checks below. # 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.Prepend(CPPPATH=["#platform/javascript"])
env.Append(CPPDEFINES=["JAVASCRIPT_ENABLED", "UNIX_ENABLED"]) env.Append(CPPDEFINES=["JAVASCRIPT_ENABLED", "UNIX_ENABLED"])