Updating emscripten to 3.1.73 (#1375)

jrouwe · Dec 4, 2024 · 08b2c1a · 08b2c1a
1 parent 1d149a3
commit 08b2c1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/determinism_check.yml b/.github/workflows/determinism_check.yml
@@ -4,7 +4,7 @@ env:
   CONVEX_VS_MESH_HASH: '0x610d538e15420778'
   RAGDOLL_HASH: '0x275057ded572c916'
   PYRAMID_HASH: '0x198b8eeaee57e29a'
-  EMSCRIPTEN_VERSION: 3.1.64
+  EMSCRIPTEN_VERSION: 3.1.73
   UBUNTU_CLANG_VERSION: clang++-15
   UBUNTU_GCC_VERSION: g++-12
   UBUNTU_GCC_AARCH64_VERSION: aarch64-linux-gnu-g++-12
@@ -209,7 +209,7 @@ jobs:
 
   emscripten:
     runs-on: ubuntu-latest
-    name: Emscripten
+    name: Emscripten Determinism Check
 
     steps:
     - name: Checkout Code

diff --git a/Build/CMakeLists.txt b/Build/CMakeLists.txt
@@ -224,6 +224,12 @@ else()
 		# On clang 14 and later we can turn off float contraction through a pragma, older versions and deterministic versions need it off always, see Core.h
 		if (CMAKE_CXX_COMPILER_VERSION LESS 14 OR CROSS_PLATFORM_DETERMINISTIC)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffp-contract=off")
+
+			# emcc complains with: warning: overriding '-ffp-model=precise' option with '-ffp-contract=off' [-Woverriding-option],
+			# but this is exactly what we want.
+			if (EMSCRIPTEN)
+				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overriding-option")
+			endif()
 		endif()
 
 		# Cross compiler flags