Skip to content

Emscripten: upgrade to version 7 #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agarny merged 4 commits into from
Nov 10, 2026
Merged

Emscripten: upgrade to version 7 #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6acffdf
New version.
agarny Nov 9, 2026
fc3cdf4
GHA: install the latest version of Emscripten.
agarny Nov 10, 2026
fe392f0
CMake: force the inclusion of <cstdlib> and <new> when building our t…
agarny Nov 10, 2026
094d2f9
Third-party libraries: updated the SHA-1 values of their WASM builds.
agarny Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/buildThirdPartyLibrary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
with:
cache_key: webassembly
- name: Install Emscripten
run: brew install emscripten
uses: emscripten-core/setup-emsdk@v16
- name: Configure libOpenCOR (for a specific third-party library)
if: ${{ inputs.third_party_library_name != 'ALL' }}
run: cmake -G Ninja -S . -B build -DBUILD_TYPE=Release -DJAVASCRIPT_BINDINGS=ON -DONLY_BUILD_THIRD_PARTY_LIBRARIES=ON -DPREBUILT_${{ inputs.third_party_library_name }}=OFF
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20261029.0
1.20261110.0
9 changes: 6 additions & 3 deletions cmake/packages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,14 +435,17 @@ if(CMAKE_C_COMPILER_LAUNCHER AND CMAKE_CXX_COMPILER_LAUNCHER)
endif()

if(EMSCRIPTEN)
# Note: we are using the same CMake variables that we used to build libOpenCOR so that we can build our third-party
# libraries in the same way that we built libOpenCOR.
# Note #1: we are using the same CMake variables that we used to build libOpenCOR, so that we can build our
# third-party libraries in the same way that we built libOpenCOR.
# Note #2: with Emscripten 7, libc++ no longer includes some headers indirectly, but some third-party libraries
# may use something from them without including them (e.g., libCellML uses std::strtod() without including
# <cstdlib> and libSBML uses std::nothrow without including <new>), so we force their inclusion.

list(APPEND CMAKE_ARGS
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DCMAKE_CROSSCOMPILING_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}\ -include\ cstdlib\ -include\ new
-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
-DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/LLVM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ if(LIBOPENCOR_PREBUILT_LLVM)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
b0180baf919d8953ffa673eb3e0f6f11d6bfcd2a)
6155cad48ecc59cf37d8b7dd8c968ae816a7fefe)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/SUNDIALS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(LIBOPENCOR_PREBUILT_SUNDIALS)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
e543ccdaaca2174c10dec3ac77bfb12c7eb9b7be)
37b6e58e99566ca1f7ca9244bf89c07657d9aa5e)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/libCOMBINE/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBCOMBINE)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
8ed8266a91d67ff28438beda9d9854df4d4b5ccf)
81e0e199fbfdc61e37fce2794d730dbd8d854a14)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/libCellML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if(LIBOPENCOR_PREBUILT_LIBCELLML)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
b0b2b2d709ccec251caf4a6fbaeba9908eb0357b)
a0ae6d3219d4f25d8940f8544e743ec85bdcc7b7)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/libNuML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBNUML)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
145f03c3e2b38f7b501eb7fbc1b22fdaa6d1368d)
8db92823664d64c45f7a35cfa9b70a57b75c2fbd)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/libSBML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBSBML)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
29604e9829a1f24f5127e5badfc5c47ae9601501)
3d203fac4766ed4297bd1442349525571a9d5f0b)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/libSEDML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(LIBOPENCOR_PREBUILT_LIBSEDML)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
f14279d7f32d8658ae13301bcc910d71330c5a59)
c318dff320dd2eab8cea701d35fa5e43ff3d9806)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/libxml2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(LIBOPENCOR_PREBUILT_LIBXML2)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
758a5a306b2d360e5563e1a72064e2c2ac1fee58)
f67b580d4d6e20fdbf25c1fef6a0187683c8caf2)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/zipper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(LIBOPENCOR_PREBUILT_ZIPPER)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
ae9fb0ae52695b9b078afdfdacd5d162722de4ee)
23f140517181270d773056970ff8944ce4805eab)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/zlib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(LIBOPENCOR_PREBUILT_ZLIB)
if(EMSCRIPTEN)
retrieve_package(${PACKAGE_NAME} ${PACKAGE_VERSION}
${PACKAGE_REPOSITORY} ${RELEASE_TAG}
78889fdace28d611207cfc1bbb459d8507d50839)
b2f0f4e24de0f076fd5d805ca4f6480a49e2b587)
else()
if(WIN32)
if(RELEASE_MODE)
Expand Down
Loading