Skip to content

Commit c82eaca

Browse files
authored
deps/bazel/wasm: Bump rules_cc -> 0.2.22 (#1292)
Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 63f39be commit c82eaca

6 files changed

Lines changed: 24 additions & 5 deletions

File tree

WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ envoy_examples_env()
66
load("//bazel:archives.bzl", "load_envoy_examples_archives")
77
load_envoy_examples_archives()
88

9+
load("@envoy-example-wasm-cc//bazel:deps_pre.bzl", "resolve_envoy_example_wasmcc_pre_dependencies")
10+
resolve_envoy_example_wasmcc_pre_dependencies()
11+
912
load("//bazel:deps.bzl", "resolve_envoy_examples_dependencies")
1013
resolve_envoy_examples_dependencies()
1114

wasm-cc/WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ workspace(name = "envoy-example-wasm-cc")
33
load("//bazel:archives.bzl", "load_envoy_example_wasmcc_archives")
44
load_envoy_example_wasmcc_archives()
55

6+
load("//bazel:deps_pre.bzl", "resolve_envoy_example_wasmcc_pre_dependencies")
7+
resolve_envoy_example_wasmcc_pre_dependencies()
8+
69
load("//bazel:deps.bzl", "resolve_envoy_example_wasmcc_dependencies")
710
resolve_envoy_example_wasmcc_dependencies()
811

wasm-cc/bazel/deps.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ load("@emsdk//:deps.bzl", emsdk_deps = "deps")
22
load("@envoy//bazel:api_binding.bzl", "envoy_api_binding")
33
load("@envoy_toolshed//sysroot:sysroot.bzl", "setup_sysroots")
44
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
5+
load("@rules_cc//cc:extensions.bzl", "compatibility_proxy_repo")
56
load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
67
load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
78
load("@rules_perl//perl:deps.bzl", "perl_rules_dependencies")
@@ -15,6 +16,7 @@ def resolve_envoy_example_wasmcc_dependencies(
1516
llvm_version=VERSIONS["llvm"],
1617
ninja_version=VERSIONS["ninja"],
1718
setup_autotools_toolchain=True):
19+
compatibility_proxy_repo()
1820
envoy_api_binding()
1921
py_repositories()
2022
bazel_toolchain_dependencies()

wasm-cc/bazel/deps_pre.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
2+
3+
def resolve_envoy_example_wasmcc_pre_dependencies():
4+
bazel_features_deps()

wasm-cc/bazel/packages.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@bazel_features//:deps.bzl", "bazel_features_deps")
21
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features")
32
load("@emsdk//:emscripten_deps.bzl", "emscripten_deps")
43
load("@envoy//bazel:repositories.bzl", "default_envoy_build_config")
@@ -12,7 +11,6 @@ def load_envoy_example_wasmcc_packages():
1211
requirements_lock = "@envoy_toolshed//:requirements.txt",
1312
python_interpreter_target = "@python3_12_host//:python",
1413
)
15-
bazel_features_deps()
1614
emscripten_deps(emscripten_version = "4.0.6")
1715
default_envoy_build_config(name = "envoy_build_config")
1816
proto_bazel_features(name = "proto_bazel_features")

wasm-cc/bazel/versions.bzl

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ VERSIONS = {
1515
"url": "https://github.com/{repo}/archive/v{version}.tar.gz",
1616
},
1717

18+
"bazel_features": {
19+
"type": "github_archive",
20+
"repo": "bazel-contrib/bazel_features",
21+
"version": "1.51.0",
22+
"sha256": "5450bfb2c8b4bc961c75368838f86156f563cc9adef1be7d504fc5619d54daab",
23+
"url": "https://github.com/{repo}/releases/download/v{version}/{name}-v{version}.tar.gz",
24+
"strip_prefix": "{name}-{version}",
25+
},
26+
1827
"bazel_skylib": {
1928
"type": "github_archive",
2029
"repo": "bazelbuild/bazel-skylib",
@@ -102,9 +111,9 @@ VERSIONS = {
102111
"rules_cc": {
103112
"type": "github_archive",
104113
"repo": "bazelbuild/rules_cc",
105-
"version": "0.1.1",
106-
"sha256": "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42",
107-
"url": "https://github.com/{repo}/releases/download/{version}/rules_cc-{version}.tar.gz",
114+
"version": "0.2.22",
115+
"sha256": "81c10a95a5c22d838276ee90d712635d6042419fdfca5ef88328226b6321e53b",
116+
"url": "https://github.com/{repo}/releases/download/{version}/{name}-{version}.tar.gz",
108117
"strip_prefix": "{name}-{version}",
109118
},
110119

0 commit comments

Comments
 (0)