Skip to content

Commit ecdb7d0

Browse files
authored
update capnp, enable debug_memory in debug mode (#3801)
1 parent 1e1e4ba commit ecdb7d0

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.bazelrc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
137137
common --@aspect_rules_ts//ts:default_to_tsc_transpiler
138138

139139
# optimized LTO build. you'll need a fairly recent clang for this to work
140-
build:thin-lto -c opt
140+
build:thin-lto --config=opt
141141
build:thin-lto --cxxopt='-flto=thin'
142142
build:thin-lto --linkopt='-flto=thin'
143143

@@ -173,8 +173,9 @@ build:limited-dbg-info --copt='-g1' --copt="-fdebug-info-for-profiling"
173173
# Miscellaneous platform-independent options
174174
build --@capnp-cpp//src/kj:openssl=True --@capnp-cpp//src/kj:zlib=True --@capnp-cpp//src/kj:brotli=True
175175
build --@capnp-cpp//src/capnp:gen_rust=True
176+
# overriden in config=opt
177+
build --@capnp-cpp//src/kj:debug_memory=True
176178
build --cxxopt="-fbracket-depth=512" --host_cxxopt="-fbracket-depth=512"
177-
build --@capnp-cpp//src/capnp:gen_rust=True
178179

179180
# Additional Rust flags (see https://doc.rust-lang.org/rustc/codegen-options/index.html)
180181
# Need to disable debug-assertions for fastbuild, should be off automatically for opt.
@@ -342,8 +343,12 @@ build:windows_dbg --linkopt='/OPT:LLDTAILMERGE' --linkopt='/OPT:SAFEICF'
342343
# a shared library.
343344
build:windows --copt='/Zc:dllexportInlines-'
344345

346+
# optimized configuration
347+
build:opt -c opt
348+
build:opt --@capnp-cpp//src/kj:debug_memory=False
349+
345350
# Release configuration.
346-
build:release -c opt
351+
build:release --config=opt
347352
build:release --@rules_rust//:extra_rustc_flag=-Ccodegen-units=1
348353

349354
# enable -O3 for the release configuration. Based on benchmarking there is little difference in

build/deps/gen/dep_capnp_cpp.bzl

Lines changed: 4 additions & 4 deletions
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/32dd6c4ddd7944a8df7f361d4620195a3985c6ef"
6-
STRIP_PREFIX = "capnproto-capnproto-32dd6c4/c++"
7-
SHA256 = "8e4d54894338ab983daac057110c20fb9ceeb9f194500e1214caf353fc61ecce"
5+
URL = "https://github.com/capnproto/capnproto/tarball/d70a4b33b9fda12c652e789abc0da90b52fae7e6"
6+
STRIP_PREFIX = "capnproto-capnproto-d70a4b3/c++"
7+
SHA256 = "13404cb7f0d7261b4ffe954d4430ec08b26b90dc8784c7e6d6470e4fdae643f6"
88
TYPE = "tgz"
9-
COMMIT = "32dd6c4ddd7944a8df7f361d4620195a3985c6ef"
9+
COMMIT = "d70a4b33b9fda12c652e789abc0da90b52fae7e6"
1010

1111
def dep_capnp_cpp():
1212
http_archive(

0 commit comments

Comments
 (0)