Upgrade emsdk to just past v3.1.44. Use wasm_cc_binary attributes.

In effect this:
- standardizes handling of standalone option
- picks up a platforms/OS fix in emsdk
- allows RE2 and Abseil to compile and link

Signed-off-by: Martijn Stevenson <[email protected]>

Author: martijneken

bazel/defs.bzl

@@ -21,6 +21,7 @@ def _optimized_wasm_cc_binary_transition_impl(settings, attr):
     #
     # Define STANDALONE_WASM at compile time as well as link time (below).
     # This influences Abseil libraries using conditional dependencies.
+    # TODO(martijneken): Remove after Abseil stops using this define.
     return {
         "//command_line_option:copt": ["-O3", "-DSTANDALONE_WASM"],
         "//command_line_option:cxxopt": [],
@@ -94,14 +95,7 @@ def proxy_wasm_cc_binary(
         linkopts = linkopts + [
             "--no-entry",
             "--js-library=$(location @proxy_wasm_cpp_sdk//:proxy_wasm_intrinsics_js)",
-            "-sSTANDALONE_WASM",
             "-sEXPORTED_FUNCTIONS=_malloc",
-            # Disable pthreads, because USE_PTHREADS implies SHARED_MEMORY and
-            #  "STANDALONE_WASM does not support shared memories yet"
-            #
-            # https://emscripten.org/docs/porting/pthreads.html
-            # https://emscripten.org/docs/api_reference/wasm_workers.html
-            "-sUSE_PTHREADS=0",
         ],
         tags = tags + [
             "manual",
@@ -111,6 +105,8 @@ def proxy_wasm_cc_binary(
     )
 
     wasm_cc_binary(
+        standalone = True,
+        threads = "off",
         name = "wasm_" + name,
         cc_target = ":proxy_wasm_" + name.rstrip(".wasm"),
         tags = tags + [

bazel/emsdk.patch

@@ -1,9 +1,9 @@
 diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl
-index 95801ba..95fdabd 100644
+index 219cd93..c127d49 100644
 --- a/bazel/emscripten_deps.bzl
 +++ b/bazel/emscripten_deps.bzl
-@@ -69,31 +69,3 @@ def emscripten_deps(emscripten_version = "latest"):
-             build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
+@@ -167,38 +167,3 @@ def emscripten_deps(emscripten_version = "latest"):
+             build_file_content = BUILD_FILE_CONTENT_TEMPLATE.format(bin_extension = ".exe"),
              type = "zip",
          )
 -
@@ -14,6 +14,13 @@ index 95801ba..95fdabd 100644
 -            package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json",
 -        )
 -
+-    if "emscripten_npm_linux_arm64" not in excludes:
+-        npm_install(
+-            name = "emscripten_npm_linux_arm64",
+-            package_json = "@emscripten_bin_linux_arm64//:emscripten/package.json",
+-            package_lock_json = "@emscripten_bin_linux_arm64//:emscripten/package-lock.json",
+-        )
+-
 -    if "emscripten_npm_mac" not in excludes:
 -        npm_install(
 -            name = "emscripten_npm_mac",
@@ -34,15 +41,3 @@ index 95801ba..95fdabd 100644
 -            package_json = "@emscripten_bin_win//:emscripten/package.json",
 -            package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json",
 -        )
-diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel
-index eb36959..12dba37 100644
---- a/bazel/emscripten_toolchain/BUILD.bazel
-+++ b/bazel/emscripten_toolchain/BUILD.bazel
-@@ -13,7 +13,6 @@ filegroup(
-         "env.sh",
-         "env.bat",
-         "@emsdk//:binaries",
--        "@emsdk//:node_modules",
-         "@nodejs//:node_files",
-     ],
- )

bazel/repositories.bzl

@@ -19,10 +19,10 @@ def proxy_wasm_cpp_sdk_repositories():
     maybe(
         http_archive,
         name = "emsdk",
-        sha256 = "1ca0ff918d476c55707bb99bc0452be28ac5fb8f22a9260a8aae8a38d1bc0e27",
-        # v3.1.7 with Bazel fixes
-        strip_prefix = "emsdk-0ea8f8a8707070e9a7c83fbb4a3065683bcf1799/bazel",
-        url = "https://github.com/emscripten-core/emsdk/archive/0ea8f8a8707070e9a7c83fbb4a3065683bcf1799.tar.gz",
+        sha256 = "52763f556d08ba0c0cde1840102e1e5fcf828b98924c4e77f629ad1d7d400933",
+        # v3.1.44 with one Bazel platforms fix
+        strip_prefix = "emsdk-ef2a8e929d5337755e9b1d1e1d4ad859dc694eee/bazel",
+        url = "https://github.com/emscripten-core/emsdk/archive/ef2a8e929d5337755e9b1d1e1d4ad859dc694eee.tar.gz",
         patches = ["@proxy_wasm_cpp_sdk//bazel:emsdk.patch"],
         patch_args = ["-p2"],
     )