Skip to content

Update Emscripten to v3.1.7. #134

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
merged 1 commit into from
Mar 11, 2022
Merged

Update Emscripten to v3.1.7. #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ sudo make install
git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
./emsdk update-tags
./emsdk install 3.1.1
./emsdk activate 3.1.1
./emsdk install 3.1.7
./emsdk activate 3.1.7

source ./emsdk\_env.sh
```
Expand All @@ -189,7 +189,7 @@ It is possible later versions will work, e.g.
./emsdk activate latest
```

However 3.1.1 is known to work.
However 3.1.7 is known to work.

### Rebuilding the libprotobuf.a files

Expand Down
10 changes: 5 additions & 5 deletions bazel/dep/deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ def wasm_dependencies():
name = "emscripten_toolchain",
build_file = "@proxy_wasm_cpp_sdk//:emscripten-toolchain.BUILD",
patch_cmds = [
"./emsdk install 3.1.1",
"./emsdk activate --embedded 3.1.1",
"./emsdk install 3.1.7",
"./emsdk activate --embedded 3.1.7",
],
strip_prefix = "emsdk-3.1.1",
url = "https://github.com/emscripten-core/emsdk/archive/3.1.1.tar.gz",
sha256 = "3a4893f0bb8203469e1197aa235fc49ed6f5dd2d490e9244a6899a8ad860f3e6",
strip_prefix = "emsdk-3.1.7",
url = "https://github.com/emscripten-core/emsdk/archive/3.1.7.tar.gz",
sha256 = "bcceced0b7cad2e08375adf74ef20fa431230abbae8766bdad268c43e34f8d03",
)

maybe(
Expand Down
4 changes: 2 additions & 2 deletions sdk_container.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ rm -rf protobuf
git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
./emsdk update-tags
./emsdk install 3.1.1
./emsdk activate 3.1.1
./emsdk install 3.1.7
./emsdk activate 3.1.7
source ./emsdk_env.sh
cd

Expand Down
4 changes: 2 additions & 2 deletions toolchain/cc_toolchain_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def _impl(ctx):
"-isystem",
"external/emscripten_toolchain/upstream/emscripten/cache/sysroot/include/",
"-isystem",
"external/emscripten_toolchain/upstream/lib/clang/14.0.0/include/",
"external/emscripten_toolchain/upstream/lib/clang/15.0.0/include/",
],
),
],
Expand Down Expand Up @@ -162,7 +162,7 @@ def _impl(ctx):
# "this rule is missing dependency declarations for the following files included".
cxx_builtin_include_directories = [
"external/emscripten_toolchain/upstream/emscripten/cache/sysroot/include/",
"external/emscripten_toolchain/upstream/lib/clang/14.0.0/include/",
"external/emscripten_toolchain/upstream/lib/clang/15.0.0/include/",
],
features = [cxx17_feature, no_canonical_prefixes_feature, opt_feature],
)
Expand Down