Update Emscripten to v3.1.7. (#134)

PiotrSikora · web-flow · commit 898aaed73e69 · 2022-03-10T18:05:15.000-06:00
Signed-off-by: Piotr Sikora &lt;piotrsikora@google.com&gt;
diff --git a/README.md b/README.md
@@ -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
 ```
@@ -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
 
diff --git a/bazel/dep/deps.bzl b/bazel/dep/deps.bzl
@@ -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(
diff --git a/sdk_container.sh b/sdk_container.sh
@@ -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
 
diff --git a/toolchain/cc_toolchain_config.bzl b/toolchain/cc_toolchain_config.bzl
@@ -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/",
                         ],
                     ),
                 ],
@@ -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],
     )
