Skip to content

Commit

Permalink
wasm: flip the meaning of the "repository" in envoy_wasm_cc_binary(). (
Browse files Browse the repository at this point in the history
…#13621)

Change the meaning of the "repository" parameter to refer to an external
Bazel repository, instead of using "@envoy" in targets that are included
in the Envoy repository.

This aligns with other envoy_* rules.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
  • Loading branch information
PiotrSikora authored Oct 19, 2020
1 parent 7915659 commit 443f0ef
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bazel/wasm/wasm.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ def wasm_cc_binary(name, tags = [], repository = "", **kwargs):
kwargs.setdefault("additional_linker_inputs", ["@proxy_wasm_cpp_sdk//:jslib", "@envoy//source/extensions/common/wasm/ext:jslib"])

if repository == "@envoy":
envoy_js = "--js-library source/extensions/common/wasm/ext/envoy_wasm_intrinsics.js"
else:
envoy_js = "--js-library external/envoy/source/extensions/common/wasm/ext/envoy_wasm_intrinsics.js"
else:
envoy_js = "--js-library source/extensions/common/wasm/ext/envoy_wasm_intrinsics.js"
kwargs.setdefault("linkopts", [
envoy_js,
"--js-library external/proxy_wasm_cpp_sdk/proxy_wasm_intrinsics.js",
Expand All @@ -112,7 +112,7 @@ def wasm_cc_binary(name, tags = [], repository = "", **kwargs):
)

def envoy_wasm_cc_binary(name, tags = [], **kwargs):
wasm_cc_binary(name, tags, repository = "@envoy", **kwargs)
wasm_cc_binary(name, tags, repository = "", **kwargs)

def wasm_rust_binary(name, tags = [], **kwargs):
wasm_name = "_wasm_" + name.replace(".", "_")
Expand Down

0 comments on commit 443f0ef

Please sign in to comment.