Skip to content

Commit afe2a1b

Browse files
committed
Patch from Envoy: exclude emsdk targets for Bazel/gcc. Fixes proxy-wasm#149.
Signed-off-by: Martijn Stevenson <[email protected]>
1 parent 95bb82c commit afe2a1b

File tree

2 files changed

+50
-0
lines changed

2 files changed

+50
-0
lines changed

bazel/emsdk.patch

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl
2+
index 95801ba..95fdabd 100644
3+
--- a/bazel/emscripten_deps.bzl
4+
+++ b/bazel/emscripten_deps.bzl
5+
@@ -69,31 +69,3 @@ def emscripten_deps(emscripten_version = "latest"):
6+
build_file = "@emsdk//emscripten_toolchain:emscripten.BUILD",
7+
type = "zip",
8+
)
9+
-
10+
- if "emscripten_npm_linux" not in excludes:
11+
- npm_install(
12+
- name = "emscripten_npm_linux",
13+
- package_json = "@emscripten_bin_linux//:emscripten/package.json",
14+
- package_lock_json = "@emscripten_bin_linux//:emscripten/package-lock.json",
15+
- )
16+
-
17+
- if "emscripten_npm_mac" not in excludes:
18+
- npm_install(
19+
- name = "emscripten_npm_mac",
20+
- package_json = "@emscripten_bin_mac//:emscripten/package.json",
21+
- package_lock_json = "@emscripten_bin_mac//:emscripten/package-lock.json",
22+
- )
23+
-
24+
- if "emscripten_npm_mac_arm64" not in excludes:
25+
- npm_install(
26+
- name = "emscripten_npm_mac",
27+
- package_json = "@emscripten_bin_mac_arm64//:emscripten/package.json",
28+
- package_lock_json = "@emscripten_bin_mac_arm64//:emscripten/package-lock.json",
29+
- )
30+
-
31+
- if "emscripten_npm_win" not in excludes:
32+
- npm_install(
33+
- name = "emscripten_npm_win",
34+
- package_json = "@emscripten_bin_win//:emscripten/package.json",
35+
- package_lock_json = "@emscripten_bin_win//:emscripten/package-lock.json",
36+
- )
37+
diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel
38+
index eb36959..12dba37 100644
39+
--- a/bazel/emscripten_toolchain/BUILD.bazel
40+
+++ b/bazel/emscripten_toolchain/BUILD.bazel
41+
@@ -13,7 +13,6 @@ filegroup(
42+
"env.sh",
43+
"env.bat",
44+
"@emsdk//:binaries",
45+
- "@emsdk//:node_modules",
46+
"@nodejs//:node_files",
47+
],
48+
)

bazel/repositories.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ def proxy_wasm_cpp_sdk_repositories():
2323
# v3.1.7 with Bazel fixes
2424
strip_prefix = "emsdk-0ea8f8a8707070e9a7c83fbb4a3065683bcf1799/bazel",
2525
url = "https://github.com/emscripten-core/emsdk/archive/0ea8f8a8707070e9a7c83fbb4a3065683bcf1799.tar.gz",
26+
patches = ["@proxy_wasm_cpp_sdk//bazel:emsdk.patch"],
27+
patch_args = ["-p2"],
2628
)
2729

2830
maybe(

0 commit comments

Comments
 (0)