Skip to content

Commit 0eb9ba2

Browse files
fhanaufhanau
committed
01-15-25 Roll deps
- With latest rules_rust, -Cembed-bitcode=n is set automatically if LTO is disabled, no need to add it manually - Rust crate data is no longer passed at compile time, so use compile_data in cxxbridge-cmd build file
1 parent a33c6d2 commit 0eb9ba2

21 files changed

+61
-68
lines changed

‎.bazelrc

+2-5
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,10 @@ build --cxxopt="-fbracket-depth=512" --host_cxxopt="-fbracket-depth=512"
156156
build --@capnp-cpp//src/capnp:gen_rust=True
157157

158158
# Additional Rust flags (see https://doc.rust-lang.org/rustc/codegen-options/index.html)
159-
# Need to disable debug-assertions for fastbuild, should be off automatically for opt. As long as
160-
# rust-level LTO is not enabled, LLVM bitcode is not needed so -C embed-bitcode=n provides a free
161-
# improvement to build speed and Rust code size.
159+
# Need to disable debug-assertions for fastbuild, should be off automatically for opt.
162160
# Using extra_rustc_flag for non-exec flags so they can be overwritten selectively.
163-
build --@rules_rust//:extra_rustc_flag=-Cembed-bitcode=n
164161
build --@rules_rust//:extra_rustc_flag=-Cdebug-assertions=n
165-
build --@rules_rust//:extra_exec_rustc_flags=-C,debug-assertions=n,-C,embed-bitcode=n
162+
build --@rules_rust//:extra_exec_rustc_flags=-Cdebug-assertions=n
166163

167164
# We default to not enabling debug assertions and unwinding for Rust. For debug builds this is not
168165
# the right setting, but unfortunately we can't set that directly.

‎WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ rust_register_toolchains(
191191
# Add support for macOS rosetta
192192
"aarch64-unknown-linux-gnu",
193193
],
194-
versions = ["1.82.0"], # LLVM 19
194+
versions = ["1.83.0"], # LLVM 19
195195
)
196196

197197
load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")

‎build/deps/build_deps.jsonc

+1-5
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,7 @@
116116
"type": "github_release",
117117
"owner": "aspect-build",
118118
"repo": "rules_js",
119-
"file_regex": "^rules_js-",
120-
// TODO(cleanup): On latest version, Windows build fails with `tar.exe: Error opening archive:
121-
// Can't initialize filter; unable to run program "gzip -d"`, likely due to
122-
// https://github.com/aspect-build/rules_js/pull/1905/files. Develop a workaround.
123-
"freeze_version": "v2.0.1"
119+
"file_regex": "^rules_js-"
124120
},
125121
{
126122
"name": "aspect_rules_ts",

‎build/deps/gen/dep_aspect_bazel_lib.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
TAG_NAME = "v2.9.4"
6-
URL = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.9.4/bazel-lib-v2.9.4.tar.gz"
7-
STRIP_PREFIX = "bazel-lib-2.9.4"
8-
SHA256 = "349aabd3c2b96caeda6181eb0ae1f14f2a1d9f3cd3c8b05d57f709ceb12e9fb3"
5+
TAG_NAME = "v2.11.0"
6+
URL = "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.11.0/bazel-lib-v2.11.0.tar.gz"
7+
STRIP_PREFIX = "bazel-lib-2.11.0"
8+
SHA256 = "c96db69dd2714a37f3298338a1a42b27e3a2696c3b36dd4441b9bf7a1a12bee0"
99
TYPE = "tgz"
1010

1111
def dep_aspect_bazel_lib():

‎build/deps/gen/dep_aspect_rules_js.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
TAG_NAME = "v2.0.1"
6-
URL = "https://github.com/aspect-build/rules_js/releases/download/v2.0.1/rules_js-v2.0.1.tar.gz"
7-
STRIP_PREFIX = "rules_js-2.0.1"
8-
SHA256 = "4cab6898f0ff8048e32640cce06a47aa4b92b2fb330d055940f95f24c8ebb868"
5+
TAG_NAME = "v2.1.2"
6+
URL = "https://github.com/aspect-build/rules_js/releases/download/v2.1.2/rules_js-v2.1.2.tar.gz"
7+
STRIP_PREFIX = "rules_js-2.1.2"
8+
SHA256 = "fbc34d815a0cc52183a1a26732fc0329e26774a51abbe0f26fc9fd2dab6133b4"
99
TYPE = "tgz"
1010

1111
def dep_aspect_rules_js():

‎build/deps/gen/dep_aspect_rules_ts.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
TAG_NAME = "v3.3.2"
6-
URL = "https://github.com/aspect-build/rules_ts/releases/download/v3.3.2/rules_ts-v3.3.2.tar.gz"
7-
STRIP_PREFIX = "rules_ts-3.3.2"
8-
SHA256 = "cff3137b043ff6bf1a2542fd9691dc762432370cd39eb4bb0756d288de52067d"
5+
TAG_NAME = "v3.4.0"
6+
URL = "https://github.com/aspect-build/rules_ts/releases/download/v3.4.0/rules_ts-v3.4.0.tar.gz"
7+
STRIP_PREFIX = "rules_ts-3.4.0"
8+
SHA256 = "013a10b2b457add73b081780e604778eb50a141709f9194298f97761acdcc169"
99
TYPE = "tgz"
1010

1111
def dep_aspect_rules_ts():

‎build/deps/gen/dep_buildifier_darwin_amd64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "v7.3.1"
6-
URL = "https://github.com/bazelbuild/buildtools/releases/download/v7.3.1/buildifier-darwin-amd64"
7-
SHA256 = "375f823103d01620aaec20a0c29c6cbca99f4fd0725ae30b93655c6704f44d71"
5+
TAG_NAME = "v8.0.1"
6+
URL = "https://github.com/bazelbuild/buildtools/releases/download/v8.0.1/buildifier-darwin-amd64"
7+
SHA256 = "802b013211dbcf91e3c0658ba33ecb3932ef5a6f6764a0b13efcec4e2df04c83"
88

99
def dep_buildifier_darwin_amd64():
1010
http_file(

‎build/deps/gen/dep_buildifier_darwin_arm64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "v7.3.1"
6-
URL = "https://github.com/bazelbuild/buildtools/releases/download/v7.3.1/buildifier-darwin-arm64"
7-
SHA256 = "5a6afc6ac7a09f5455ba0b89bd99d5ae23b4174dc5dc9d6c0ed5ce8caac3f813"
5+
TAG_NAME = "v8.0.1"
6+
URL = "https://github.com/bazelbuild/buildtools/releases/download/v8.0.1/buildifier-darwin-arm64"
7+
SHA256 = "833e2afc331b9ad8f6b038ad3d69ceeaf97651900bf2a3a45f54f42cafe0bfd3"
88

99
def dep_buildifier_darwin_arm64():
1010
http_file(

‎build/deps/gen/dep_buildifier_linux_amd64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "v7.3.1"
6-
URL = "https://github.com/bazelbuild/buildtools/releases/download/v7.3.1/buildifier-linux-amd64"
7-
SHA256 = "5474cc5128a74e806783d54081f581662c4be8ae65022f557e9281ed5dc88009"
5+
TAG_NAME = "v8.0.1"
6+
URL = "https://github.com/bazelbuild/buildtools/releases/download/v8.0.1/buildifier-linux-amd64"
7+
SHA256 = "1976053ed4decd6dd93170885b4387eddc76ec70dc2697b2e91a9af83269418a"
88

99
def dep_buildifier_linux_amd64():
1010
http_file(

‎build/deps/gen/dep_buildifier_linux_arm64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "v7.3.1"
6-
URL = "https://github.com/bazelbuild/buildtools/releases/download/v7.3.1/buildifier-linux-arm64"
7-
SHA256 = "0bf86c4bfffaf4f08eed77bde5b2082e4ae5039a11e2e8b03984c173c34a561c"
5+
TAG_NAME = "v8.0.1"
6+
URL = "https://github.com/bazelbuild/buildtools/releases/download/v8.0.1/buildifier-linux-arm64"
7+
SHA256 = "93078c57763493bdc2914ed340544500b8f3497341a62e90f00e9e184c4d9c2c"
88

99
def dep_buildifier_linux_arm64():
1010
http_file(

‎build/deps/gen/dep_buildifier_windows_amd64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "v7.3.1"
6-
URL = "https://github.com/bazelbuild/buildtools/releases/download/v7.3.1/buildifier-windows-amd64.exe"
7-
SHA256 = "370cd576075ad29930a82f5de132f1a1de4084c784a82514bd4da80c85acf4a8"
5+
TAG_NAME = "v8.0.1"
6+
URL = "https://github.com/bazelbuild/buildtools/releases/download/v8.0.1/buildifier-windows-amd64.exe"
7+
SHA256 = "6edc9247e6d42d27fb67b9509bb795d159a12468faa89e9f290dcadc26571c31"
88

99
def dep_buildifier_windows_amd64():
1010
http_file(

‎build/deps/gen/dep_capnp_cpp.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
URL = "https://github.com/capnproto/capnproto/tarball/1c676b2df7f97220607591a38c28ce7e4a968ad4"
6-
STRIP_PREFIX = "capnproto-capnproto-1c676b2/c++"
7-
SHA256 = "9281b860a778c9427c55be647d1247d9f8373ab9023e671505881bf2172eba04"
5+
URL = "https://github.com/capnproto/capnproto/tarball/f600d249496c55289fa07fd6a21cadeeb340edb9"
6+
STRIP_PREFIX = "capnproto-capnproto-f600d24/c++"
7+
SHA256 = "1d96cd31ad93eaf8194ba51d4a009a4f08332ad643740c4b49c081a515a27a60"
88
TYPE = "tgz"
9-
COMMIT = "1c676b2df7f97220607591a38c28ce7e4a968ad4"
9+
COMMIT = "f600d249496c55289fa07fd6a21cadeeb340edb9"
1010

1111
def dep_capnp_cpp():
1212
http_archive(

‎build/deps/gen/dep_cargo_bazel_linux_arm64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "0.54.1"
6-
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/cargo-bazel-aarch64-unknown-linux-gnu"
7-
SHA256 = "3792feb084bd43b9a7a9cd75be86ee9910b46db59360d6b29c9cca2f8889a0aa"
5+
TAG_NAME = "0.56.0"
6+
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-aarch64-unknown-linux-gnu"
7+
SHA256 = "f3a35b137221d4627ba0ed62f775c4d3cbb45b6db839ae47f2ebfd48abe44a91"
88

99
def dep_cargo_bazel_linux_arm64():
1010
http_file(

‎build/deps/gen/dep_cargo_bazel_linux_x64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "0.54.1"
6-
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/cargo-bazel-x86_64-unknown-linux-gnu"
7-
SHA256 = "2b9d07f34694f63f0cc704989ad6ec148ff8d126579832f4f4d88edea75875b2"
5+
TAG_NAME = "0.56.0"
6+
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-x86_64-unknown-linux-gnu"
7+
SHA256 = "53418ae5457040e84009f7c69b070e1f12f10a9a3a3ef4f5d0829c66e5438ba1"
88

99
def dep_cargo_bazel_linux_x64():
1010
http_file(

‎build/deps/gen/dep_cargo_bazel_macos_arm64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "0.54.1"
6-
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/cargo-bazel-aarch64-apple-darwin"
7-
SHA256 = "8204746334a17823bd6a54ce2c3821b0bdca96576700d568e2ca2bd8224dc0ea"
5+
TAG_NAME = "0.56.0"
6+
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-aarch64-apple-darwin"
7+
SHA256 = "5143e347ec45e0fcc249f1de44f0dce227062579ad364a0b269b39f0ce49f1d8"
88

99
def dep_cargo_bazel_macos_arm64():
1010
http_file(

‎build/deps/gen/dep_cargo_bazel_macos_x64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "0.54.1"
6-
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/cargo-bazel-x86_64-apple-darwin"
7-
SHA256 = "2ee14b230d32c05415852b7a388b76e700c87c506459e5b31ced19d6c131b6d0"
5+
TAG_NAME = "0.56.0"
6+
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-x86_64-apple-darwin"
7+
SHA256 = "9e8a92674771982f68031d0cc516ba08b34dd736c4f818d51349547f2136d012"
88

99
def dep_cargo_bazel_macos_x64():
1010
http_file(

‎build/deps/gen/dep_cargo_bazel_win_x64.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
load("@//:build/http.bzl", "http_file")
44

5-
TAG_NAME = "0.54.1"
6-
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/cargo-bazel-x86_64-pc-windows-msvc.exe"
7-
SHA256 = "609e894dc52576407afd5edf3b293eab2774e4fffc25ae212ab138556ff7306d"
5+
TAG_NAME = "0.56.0"
6+
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-x86_64-pc-windows-msvc.exe"
7+
SHA256 = "5c62a1c42b71af6c2765dc5f9518eba22ed28276a65f7accf5a2bca0c5cfaf74"
88

99
def dep_cargo_bazel_win_x64():
1010
http_file(

‎build/deps/gen/dep_cxxbridge_cmd.bzl

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
URL = "https://crates.io/api/v1/crates/cxxbridge-cmd/1.0.131/download"
6-
STRIP_PREFIX = "cxxbridge-cmd-1.0.131"
7-
SHA256 = "5b12e3f7b0477bd2e469107b778d333171cae561a555e96157e67bbd9f42e54f"
5+
URL = "https://crates.io/api/v1/crates/cxxbridge-cmd/1.0.136/download"
6+
STRIP_PREFIX = "cxxbridge-cmd-1.0.136"
7+
SHA256 = "6c33fd49f5d956a1b7ee5f7a9768d58580c6752838d92e39d0d56439efdedc35"
88
TYPE = "tgz"
9-
VERSION = "1.0.131"
9+
VERSION = "1.0.136"
1010

1111
def dep_cxxbridge_cmd():
1212
http_archive(

‎build/deps/gen/dep_rules_rust.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
TAG_NAME = "0.54.1"
6-
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/rules_rust-v0.54.1.tar.gz"
5+
TAG_NAME = "0.56.0"
6+
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/rules_rust-0.56.0.tar.gz"
77
STRIP_PREFIX = ""
8-
SHA256 = "af4f56caae50a99a68bfce39b141b509dd68548c8204b98ab7a1cafc94d5bb02"
8+
SHA256 = "f1306aac0b258b790df01ad9abc6abb0df0b65416c74b4ef27f4aab298780a64"
99
TYPE = "tgz"
1010

1111
def dep_rules_rust():

‎build/deps/gen/dep_simdutf.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
load("@//:build/http.bzl", "http_archive")
44

5-
TAG_NAME = "v5.6.3"
6-
URL = "https://github.com/simdutf/simdutf/releases/download/v5.6.3/singleheader.zip"
5+
TAG_NAME = "v6.0.3"
6+
URL = "https://github.com/simdutf/simdutf/releases/download/v6.0.3/singleheader.zip"
77
STRIP_PREFIX = ""
8-
SHA256 = "33e2968e0f14a72c970c4838e08e502438f37c0a856a9238d69d9161727ba4c2"
8+
SHA256 = "0e5ba4bc981633bb024ee066833f733b7d3422bc6250f6a6b5bbc09121b782af"
99
TYPE = "zip"
1010

1111
def dep_simdutf():

‎deps/rust/BUILD.cxxbridge-cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load("@rules_rust//rust:defs.bzl", "rust_binary")
55
rust_binary(
66
name = "cxxbridge-cmd",
77
srcs = glob(["src/**/*.rs"]),
8-
data = ["src/gen/include/cxx.h"],
8+
compile_data = ["src/gen/include/cxx.h"],
99
edition = "2021",
1010
visibility = ["//visibility:public"],
1111
deps = [

0 commit comments

Comments
 (0)