Skip to content

upgrade emsdk to v4.0.21 #26713

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

Draft
fs-eire wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

upgrade emsdk to v4.0.21 #26713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a54cc41
upgrade emsdk to v4.0.21
fs-eire Dec 3, 2025
a550e26
try fix one break
fs-eire Dec 6, 2025
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
[submodule "cmake/external/emsdk"]
path = cmake/external/emsdk
url = https://github.com/emscripten-core/emsdk.git
branch = 4.0.11
branch = 4.0.21
2 changes: 1 addition & 1 deletion cmake/external/emsdk
Open in desktop
Submodule emsdk updated 18 files
+35 −16 .circleci/config.yml
+1 −0 .gitignore
+7 −6 README.md
+1 −1 bazel/MODULE.bazel
+0 −4 bazel/emscripten_toolchain/link_wrapper.py
+16 −5 bazel/emscripten_toolchain/toolchain.bzl
+0 −12 bazel/emscripten_toolchain/wasm_cc_binary.bzl
+80 −0 bazel/revisions.bzl
+9 −7 docker/Makefile
+21 −1 emscripten-releases-tags.json
+7 −0 emsdk.bat
+7 −3 emsdk.ps1
+475 −153 emsdk.py
+213 −0 emsdk_manifest.json
+6 −3 scripts/update_node.py
+0 −1 scripts/update_python.py
+0 −1 test/test.bat
+2 −0 test/test.py
2 changes: 1 addition & 1 deletion tools/ci_build/build_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ def add_webassembly_args(parser: argparse.ArgumentParser) -> None:
"""Adds arguments for WebAssembly (WASM) platform builds."""
parser.add_argument("--build_wasm", action="store_true", help="Build for WebAssembly.")
parser.add_argument("--build_wasm_static_lib", action="store_true", help="Build WebAssembly static library.")
parser.add_argument("--emsdk_version", default="4.0.11", help="Specify version of emsdk.")
parser.add_argument("--emsdk_version", default="4.0.21", help="Specify version of emsdk.")
parser.add_argument(
"--enable_wasm_jspi", action="store_true", help="Enable WebAssembly JavaScript Promise Integration."
)
Expand Down
8 changes: 4 additions & 4 deletions tools/ci_build/github/azure-pipelines/templates/linux-wasm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ jobs:
- script: |
set -ex
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
./emsdk install 4.0.11 ccache-git-emscripten-64bit
./emsdk activate 4.0.11 ccache-git-emscripten-64bit
./emsdk install 4.0.21 ccache-git-emscripten-64bit
./emsdk activate 4.0.21 ccache-git-emscripten-64bit
displayName: 'emsdk install and activate ccache for emscripten'
- ${{if eq(parameters.WithCache, false)}}:
- script: |
set -ex
cd '$(Build.SourcesDirectory)/cmake/external/emsdk'
./emsdk install 4.0.11
./emsdk activate 4.0.11
./emsdk install 4.0.21
./emsdk activate 4.0.21
displayName: 'emsdk install and activate ccache for emscripten'

- template: build-linux-wasm-step.yml
Expand Down
18 changes: 17 additions & 1 deletion tools/python/util/vcpkg_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,25 @@ def add_port_configs(f, has_exception: bool, is_emscripten: bool, enable_minimal
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
"-DBENCHMARK_ENABLE_WERROR=OFF"
)
endif()
"""
)
if (is_emscripten):
Copy link
Contributor

@github-actions github-actions bot Dec 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (is_emscripten):
if is_emscripten:

# workaround for https://github.com/google/benchmark/issues/2057
f.write(
r"""
string(APPEND VCPKG_C_FLAGS
" -Wno-c2y-extensions"
)
string(APPEND VCPKG_CXX_FLAGS
" -Wno-c2y-extensions"
)
"""
)
f.write(r"""
endif() # benchmark
"""
)
Comment on lines +43 to +44
Copy link
Contributor

@github-actions github-actions bot Dec 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"""
)
""")


f.write(
r"""if(PORT MATCHES "date")
list(APPEND VCPKG_CMAKE_CONFIGURE_OPTIONS
Expand Down
Loading