Skip to content

Commit e58d30a

Browse files
authored
deps/emscripten: Add support for dwp files in wasm builds (#39707)
Also, install before `proxy-wasm-cpp-sdk` to ensure it is used/patched Currently its installed after, making our setup redundant includes patch of emscripten-core/emsdk#1531 the context for this is that its required to use a hermetic llvm toolchain (other than being generally useful) without it, redundant hackery/patching would be required as the newer platforms way of setting up toolchains expects _something_ to be setup for various bins. Rather than adding a stub i figured add the fix. This has historically been the main blocker to adding llvm toolchains, or using the bazel platforms setup Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 5e9bc54 commit e58d30a

File tree

2 files changed

+397
-4
lines changed

2 files changed

+397
-4
lines changed

bazel/dependency_imports.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
4242
pip_dev_dependencies()
4343
pip_fuzzing_dependencies()
4444
rules_pkg_dependencies()
45+
emscripten_deps(emscripten_version = "4.0.6")
46+
register_emscripten_toolchains()
47+
4548
rust_repository_set(
4649
name = "rust_linux_s390x",
4750
exec_triple = "s390x-unknown-linux-gnu",
@@ -66,8 +69,6 @@ def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, y
6669
oss_fuzz = True,
6770
honggfuzz = False,
6871
)
69-
emscripten_deps(emscripten_version = "3.1.67")
70-
register_emscripten_toolchains()
7172
register_jq_toolchains(version = jq_version)
7273
register_yq_toolchains(version = yq_version)
7374
parser_deps()

0 commit comments

Comments
 (0)