From 2c70d616ab96f620631f031c35a247c18592d626 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Wed, 26 Jul 2023 06:44:25 +0000 Subject: [PATCH 1/9] Update compile/link options to work with Abseil. - Define STANDALONE_WASM at compile time - Disable USE_PTHREADS at link time (it implies SHARED_MEMORY, which is incompatible with STANDALONE_WASM) Signed-off-by: Martijn Stevenson --- bazel/defs.bzl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bazel/defs.bzl b/bazel/defs.bzl index 2e20a86..16999f2 100644 --- a/bazel/defs.bzl +++ b/bazel/defs.bzl @@ -18,8 +18,11 @@ load("@rules_cc//cc:defs.bzl", "cc_binary") def _optimized_wasm_cc_binary_transition_impl(settings, attr): # TODO(PiotrSikora): Add -flto to copts/linkopts when fixed in emsdk. # See: https://github.com/emscripten-core/emsdk/issues/971 + # + # Define STANDALONE_WASM at compile time as well as link time (below). + # This influences Abseil libraries using conditional dependencies. return { - "//command_line_option:copt": ["-O3"], + "//command_line_option:copt": ["-O3", "-DSTANDALONE_WASM"], "//command_line_option:cxxopt": [], "//command_line_option:linkopt": [], "//command_line_option:collect_code_coverage": False, @@ -93,6 +96,12 @@ def proxy_wasm_cc_binary( "--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", From 9c59bfc3ba43a608a2b38b33576ac7121ac7ca69 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Sat, 29 Jul 2023 03:49:42 +0000 Subject: [PATCH 2/9] 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 --- bazel/defs.bzl | 10 +++------- bazel/emsdk.patch | 25 ++++++++++--------------- bazel/repositories.bzl | 8 ++++---- 3 files changed, 17 insertions(+), 26 deletions(-) diff --git a/bazel/defs.bzl b/bazel/defs.bzl index 16999f2..0440d12 100644 --- a/bazel/defs.bzl +++ b/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 + [ diff --git a/bazel/emsdk.patch b/bazel/emsdk.patch index 21ee899..032ca53 100644 --- a/bazel/emsdk.patch +++ b/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", - ], - ) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 59ec24b..c622d56 100644 --- a/bazel/repositories.bzl +++ b/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"], ) From a98d0fa3e0830a22b508c97cfa0dc23dc3b935d2 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Sat, 29 Jul 2023 18:00:54 +0000 Subject: [PATCH 3/9] Register emscripten toolchains. Signed-off-by: Martijn Stevenson --- bazel/dependencies_extra.bzl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bazel/dependencies_extra.bzl b/bazel/dependencies_extra.bzl index 7bfa2e4..48622e3 100644 --- a/bazel/dependencies_extra.bzl +++ b/bazel/dependencies_extra.bzl @@ -13,7 +13,9 @@ # limitations under the License. load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") +load("@emsdk//:toolchains.bzl", "register_emscripten_toolchains") # Requires proxy_wasm_cpp_sdk_dependencies() to be loaded first. def proxy_wasm_cpp_sdk_dependencies_extra(): emscripten_deps() + register_emscripten_toolchains() From dd0aad57d10726dc00d28819255c927ada8be94c Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Mon, 31 Jul 2023 20:21:54 +0000 Subject: [PATCH 4/9] Upgrade protobuf to pick up new zlib. Centralize C++17 copt. Upgrade utf8_range to latest fix a build issue. Signed-off-by: Martijn Stevenson --- .bazelrc | 5 +++++ BUILD | 5 ----- bazel/repositories.bzl | 17 ++++++++++++++--- example/BUILD | 3 --- 4 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 .bazelrc diff --git a/.bazelrc b/.bazelrc new file mode 100644 index 0000000..d6571fc --- /dev/null +++ b/.bazelrc @@ -0,0 +1,5 @@ +# Required for emsdk: https://github.com/emscripten-core/emsdk/blob/main/bazel/README.md +build --incompatible_enable_cc_toolchain_resolution + +# C++14 or higher is required by Abseil, which is included from protobuf. +build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 diff --git a/BUILD b/BUILD index 5b2730e..e341a48 100644 --- a/BUILD +++ b/BUILD @@ -13,7 +13,6 @@ cc_library( "proxy_wasm_api.h", "proxy_wasm_externs.h", ], - copts = ["-std=c++17"], deps = [ ":common_lib", "@com_google_protobuf//:protobuf_lite", @@ -26,7 +25,6 @@ cc_library( "proxy_wasm_common.h", "proxy_wasm_enums.h", ], - copts = ["-std=c++17"], ) cc_library( @@ -41,7 +39,6 @@ cc_library( "proxy_wasm_externs.h", "proxy_wasm_intrinsics.h", ], - copts = ["-std=c++17"], visibility = ["//visibility:public"], ) @@ -65,7 +62,6 @@ proto_library( cc_library( name = "proxy_wasm_intrinsics_lite", hdrs = ["proxy_wasm_intrinsics_lite.h"], - copts = ["-std=c++17"], defines = ["PROXY_WASM_PROTOBUF_LITE"], visibility = ["//visibility:public"], deps = [ @@ -79,7 +75,6 @@ cc_library( cc_library( name = "proxy_wasm_intrinsics_full", hdrs = ["proxy_wasm_intrinsics_full.h"], - copts = ["-std=c++17"], defines = ["PROXY_WASM_PROTOBUF_FULL"], visibility = ["//visibility:public"], deps = [ diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index c622d56..2111f36 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -30,7 +30,18 @@ def proxy_wasm_cpp_sdk_repositories(): maybe( http_archive, name = "com_google_protobuf", - sha256 = "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2", - strip_prefix = "protobuf-3.17.3", - url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz", + sha256 = "a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971", + strip_prefix = "protobuf-23.4", + url = "https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protobuf-23.4.tar.gz", + ) + + # Update protobuf dependency to fix unused function CodepointSkipBackwards. + # https://github.com/protocolbuffers/utf8_range/commit/d863bc33e15cba6d873c878dcca9e6fe52b2f8cb + # TODO(martijneken): Remove this when protobuf picks up the fix. + maybe( + http_archive, + name = "utf8_range", + sha256 = "568988b5f7261ca181468dba38849fabf59dd9200fb2ed4b2823da187ef84d8c", + strip_prefix = "utf8_range-d863bc33e15cba6d873c878dcca9e6fe52b2f8cb", + url = "https://github.com/protocolbuffers/utf8_range/archive/d863bc33e15cba6d873c878dcca9e6fe52b2f8cb.zip", ) diff --git a/example/BUILD b/example/BUILD index ea2cc66..85832b8 100644 --- a/example/BUILD +++ b/example/BUILD @@ -5,19 +5,16 @@ licenses(["notice"]) # Apache 2 proxy_wasm_cc_binary( name = "http_wasm_example.wasm", srcs = ["http_wasm_example.cc"], - copts = ["-std=c++17"], ) proxy_wasm_cc_binary( name = "http_wasm_example_with_protobuf_lite.wasm", srcs = ["http_wasm_example.cc"], - copts = ["-std=c++17"], protobuf = "lite", ) proxy_wasm_cc_binary( name = "http_wasm_example_with_protobuf_full.wasm", srcs = ["http_wasm_example.cc"], - copts = ["-std=c++17"], protobuf = "full", ) From fe5c4a9a6067a4c359b9c2e726bd76ff9e816fc0 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Thu, 17 Aug 2023 19:18:00 +0000 Subject: [PATCH 5/9] Revert the protobuf update, which had broad fallout. Instead, silence a zlib warning in the emsdk transition. Signed-off-by: Martijn Stevenson --- .bazelrc | 6 ++---- BUILD | 5 +++++ bazel/defs.bzl | 7 ++++++- bazel/repositories.bzl | 17 +++-------------- example/BUILD | 3 +++ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.bazelrc b/.bazelrc index d6571fc..e895e2b 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,5 +1,3 @@ -# Required for emsdk: https://github.com/emscripten-core/emsdk/blob/main/bazel/README.md +# Claimed to be required for emsdk: +# https://github.com/emscripten-core/emsdk/blob/main/bazel/README.md build --incompatible_enable_cc_toolchain_resolution - -# C++14 or higher is required by Abseil, which is included from protobuf. -build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 diff --git a/BUILD b/BUILD index e341a48..5b2730e 100644 --- a/BUILD +++ b/BUILD @@ -13,6 +13,7 @@ cc_library( "proxy_wasm_api.h", "proxy_wasm_externs.h", ], + copts = ["-std=c++17"], deps = [ ":common_lib", "@com_google_protobuf//:protobuf_lite", @@ -25,6 +26,7 @@ cc_library( "proxy_wasm_common.h", "proxy_wasm_enums.h", ], + copts = ["-std=c++17"], ) cc_library( @@ -39,6 +41,7 @@ cc_library( "proxy_wasm_externs.h", "proxy_wasm_intrinsics.h", ], + copts = ["-std=c++17"], visibility = ["//visibility:public"], ) @@ -62,6 +65,7 @@ proto_library( cc_library( name = "proxy_wasm_intrinsics_lite", hdrs = ["proxy_wasm_intrinsics_lite.h"], + copts = ["-std=c++17"], defines = ["PROXY_WASM_PROTOBUF_LITE"], visibility = ["//visibility:public"], deps = [ @@ -75,6 +79,7 @@ cc_library( cc_library( name = "proxy_wasm_intrinsics_full", hdrs = ["proxy_wasm_intrinsics_full.h"], + copts = ["-std=c++17"], defines = ["PROXY_WASM_PROTOBUF_FULL"], visibility = ["//visibility:public"], deps = [ diff --git a/bazel/defs.bzl b/bazel/defs.bzl index 0440d12..733a602 100644 --- a/bazel/defs.bzl +++ b/bazel/defs.bzl @@ -22,8 +22,13 @@ 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. + # + # Disable warning -Wdeprecated-non-prototype for zlib: + # https://github.com/madler/zlib/issues/633 + # This is fixed in more recent versions of zlib / protobuf. + # TODO(martijneken): Remove after protobuf version update. return { - "//command_line_option:copt": ["-O3", "-DSTANDALONE_WASM"], + "//command_line_option:copt": ["-O3", "-DSTANDALONE_WASM", "-Wno-deprecated-non-prototype"], "//command_line_option:cxxopt": [], "//command_line_option:linkopt": [], "//command_line_option:collect_code_coverage": False, diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index 2111f36..c622d56 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -30,18 +30,7 @@ def proxy_wasm_cpp_sdk_repositories(): maybe( http_archive, name = "com_google_protobuf", - sha256 = "a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971", - strip_prefix = "protobuf-23.4", - url = "https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protobuf-23.4.tar.gz", - ) - - # Update protobuf dependency to fix unused function CodepointSkipBackwards. - # https://github.com/protocolbuffers/utf8_range/commit/d863bc33e15cba6d873c878dcca9e6fe52b2f8cb - # TODO(martijneken): Remove this when protobuf picks up the fix. - maybe( - http_archive, - name = "utf8_range", - sha256 = "568988b5f7261ca181468dba38849fabf59dd9200fb2ed4b2823da187ef84d8c", - strip_prefix = "utf8_range-d863bc33e15cba6d873c878dcca9e6fe52b2f8cb", - url = "https://github.com/protocolbuffers/utf8_range/archive/d863bc33e15cba6d873c878dcca9e6fe52b2f8cb.zip", + sha256 = "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2", + strip_prefix = "protobuf-3.17.3", + url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz", ) diff --git a/example/BUILD b/example/BUILD index 85832b8..ea2cc66 100644 --- a/example/BUILD +++ b/example/BUILD @@ -5,16 +5,19 @@ licenses(["notice"]) # Apache 2 proxy_wasm_cc_binary( name = "http_wasm_example.wasm", srcs = ["http_wasm_example.cc"], + copts = ["-std=c++17"], ) proxy_wasm_cc_binary( name = "http_wasm_example_with_protobuf_lite.wasm", srcs = ["http_wasm_example.cc"], + copts = ["-std=c++17"], protobuf = "lite", ) proxy_wasm_cc_binary( name = "http_wasm_example_with_protobuf_full.wasm", srcs = ["http_wasm_example.cc"], + copts = ["-std=c++17"], protobuf = "full", ) From aee8ad942dbf72e2e69cd98ee18f620e9196af19 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Fri, 25 Aug 2023 15:13:09 +0000 Subject: [PATCH 6/9] Fix emsdk patch to exclude nodejs dependency Signed-off-by: Martijn Stevenson --- bazel/emsdk.patch | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/bazel/emsdk.patch b/bazel/emsdk.patch index 032ca53..93094cb 100644 --- a/bazel/emsdk.patch +++ b/bazel/emsdk.patch @@ -1,8 +1,20 @@ diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl -index 219cd93..c127d49 100644 +index 219cd93..4842085 100644 --- a/bazel/emscripten_deps.bzl +++ b/bazel/emscripten_deps.bzl -@@ -167,38 +167,3 @@ def emscripten_deps(emscripten_version = "latest"): +@@ -111,11 +111,6 @@ def emscripten_deps(emscripten_version = "latest"): + # This could potentially backfire for projects with multiple emscripten + # dependencies that use different emscripten versions + excludes = native.existing_rules().keys() +- if "nodejs_toolchains" not in excludes: +- # Node 16 is the first version that supports darwin_arm64 +- node_repositories( +- node_version = "16.6.2", +- ) + + if "emscripten_bin_linux" not in excludes: + http_archive( +@@ -167,38 +162,3 @@ def emscripten_deps(emscripten_version = "latest"): build_file_content = BUILD_FILE_CONTENT_TEMPLATE.format(bin_extension = ".exe"), type = "zip", ) From bf80e01f328ffcfe177e85a8b8c8545f75703d12 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Fri, 25 Aug 2023 15:53:35 +0000 Subject: [PATCH 7/9] Revert "Fix emsdk patch to exclude nodejs dependency" This reverts commit 38a03321e6414cde860b609ae8171e108b311452. Emscripten depends on nodejs, so this was wrong. Root cause is likely some sort of CI-env fetch issue. Signed-off-by: Martijn Stevenson --- bazel/emsdk.patch | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/bazel/emsdk.patch b/bazel/emsdk.patch index 93094cb..032ca53 100644 --- a/bazel/emsdk.patch +++ b/bazel/emsdk.patch @@ -1,20 +1,8 @@ diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl -index 219cd93..4842085 100644 +index 219cd93..c127d49 100644 --- a/bazel/emscripten_deps.bzl +++ b/bazel/emscripten_deps.bzl -@@ -111,11 +111,6 @@ def emscripten_deps(emscripten_version = "latest"): - # This could potentially backfire for projects with multiple emscripten - # dependencies that use different emscripten versions - excludes = native.existing_rules().keys() -- if "nodejs_toolchains" not in excludes: -- # Node 16 is the first version that supports darwin_arm64 -- node_repositories( -- node_version = "16.6.2", -- ) - - if "emscripten_bin_linux" not in excludes: - http_archive( -@@ -167,38 +162,3 @@ def emscripten_deps(emscripten_version = "latest"): +@@ -167,38 +167,3 @@ def emscripten_deps(emscripten_version = "latest"): build_file_content = BUILD_FILE_CONTENT_TEMPLATE.format(bin_extension = ".exe"), type = "zip", ) From 9a7fa13ccb80333a6d81ec045c24a63b59aca7de Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Tue, 29 Aug 2023 19:09:57 +0000 Subject: [PATCH 8/9] Update emsdk to pick up a cmake build fix in PR#1274. Signed-off-by: Martijn Stevenson --- bazel/repositories.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index c622d56..ea840c6 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -19,10 +19,10 @@ def proxy_wasm_cpp_sdk_repositories(): maybe( http_archive, name = "emsdk", - 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", + sha256 = "05bad056df1286f920c675504787510434ae8b1b2d83746e0a9b0589429dbe55", + # v3.1.44 with Bazel platforms fixes + strip_prefix = "emsdk-9b0db91883452051aca8deddc932363aab29060b/bazel", + url = "https://github.com/emscripten-core/emsdk/archive/9b0db91883452051aca8deddc932363aab29060b.tar.gz", patches = ["@proxy_wasm_cpp_sdk//bazel:emsdk.patch"], patch_args = ["-p2"], ) From 816e4031830e09684875113fc9dd573854bdf968 Mon Sep 17 00:00:00 2001 From: Martijn Stevenson Date: Tue, 1 Oct 2024 14:18:01 +0000 Subject: [PATCH 9/9] Bump to emsdk 3.1.67 Signed-off-by: Martijn Stevenson --- bazel/repositories.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl index ea840c6..cc3333b 100644 --- a/bazel/repositories.bzl +++ b/bazel/repositories.bzl @@ -19,10 +19,10 @@ def proxy_wasm_cpp_sdk_repositories(): maybe( http_archive, name = "emsdk", - sha256 = "05bad056df1286f920c675504787510434ae8b1b2d83746e0a9b0589429dbe55", - # v3.1.44 with Bazel platforms fixes - strip_prefix = "emsdk-9b0db91883452051aca8deddc932363aab29060b/bazel", - url = "https://github.com/emscripten-core/emsdk/archive/9b0db91883452051aca8deddc932363aab29060b.tar.gz", + sha256 = "d9e084ef352adaa4a15470f0dfc675fe8cab1a4e4d1720fb2e7547f31c3b5d40", + # v3.1.67 + strip_prefix = "emsdk-a2383b33581adb7383c8f874d2dc34e07d055332/bazel", + url = "https://github.com/emscripten-core/emsdk/archive/a2383b33581adb7383c8f874d2dc34e07d055332.tar.gz", patches = ["@proxy_wasm_cpp_sdk//bazel:emsdk.patch"], patch_args = ["-p2"], )