Browse Source

HTML5: Fix warning with Emscripten 3.1.20

Use version 3.1.14 for CI like for official builds.

(cherry picked from commit 5271d699092e04e5bc65a4d57c6b789b0fb615da)
Rémi Verschelde 3 years ago
parent
commit
2bb8183011
2 changed files with 3 additions and 3 deletions
  1. 1 1
      .github/workflows/javascript_builds.yml
  2. 2 2
      platform/javascript/detect.py

+ 1 - 1
.github/workflows/javascript_builds.yml

@@ -6,7 +6,7 @@ env:
   # Only used for the cache key. Increment version to force clean build.
   # Only used for the cache key. Increment version to force clean build.
   GODOT_BASE_BRANCH: 3.5
   GODOT_BASE_BRANCH: 3.5
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
   SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
-  EM_VERSION: 3.1.10
+  EM_VERSION: 3.1.14
   EM_CACHE_FOLDER: "emsdk-cache"
   EM_CACHE_FOLDER: "emsdk-cache"
 
 
 concurrency:
 concurrency:

+ 2 - 2
platform/javascript/detect.py

@@ -157,9 +157,9 @@ def configure(env):
     env["ARCOM_POSIX"] = env["ARCOM"].replace("$TARGET", "$TARGET.posix").replace("$SOURCES", "$SOURCES.posix")
     env["ARCOM_POSIX"] = env["ARCOM"].replace("$TARGET", "$TARGET.posix").replace("$SOURCES", "$SOURCES.posix")
     env["ARCOM"] = "${TEMPFILE(ARCOM_POSIX)}"
     env["ARCOM"] = "${TEMPFILE(ARCOM_POSIX)}"
 
 
-    # All intermediate files are just LLVM bitcode.
+    # All intermediate files are just object files.
     env["OBJPREFIX"] = ""
     env["OBJPREFIX"] = ""
-    env["OBJSUFFIX"] = ".bc"
+    env["OBJSUFFIX"] = ".o"
     env["PROGPREFIX"] = ""
     env["PROGPREFIX"] = ""
     # Program() output consists of multiple files, so specify suffixes manually at builder.
     # Program() output consists of multiple files, so specify suffixes manually at builder.
     env["PROGSUFFIX"] = ""
     env["PROGSUFFIX"] = ""