Skip to content

Commit 52690b9

Browse files
danakjAravind Vasudevan
authored andcommitted
Pick up a patch to escape spaces in bindgen's depfile outputs
Windows paths have spaces in them and they need to be escaped or ninja can't track dependencies correctly. This rolls bindgen to HEAD (roughly 0.65.1) at the same time, which has a couple visible changes: The size_t-is-usize argument has been inverted and replaced, so remove our use of it from run_bindgen.py. ``` error: unexpected argument '--size_t-is-usize' found note: argument '--no-size_t-is-usize' exists ``` The `clap` feature has also been removed, so remove our use of it when building bindgen. Bug: 1271215 Change-Id: Ic3b745642da415b28bdeee4ff0398d701214118f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4420089 Commit-Queue: danakj <danakj@chromium.org> Reviewed-by: Collin Baker <collinbaker@chromium.org> Cr-Commit-Position: refs/heads/main@{#1130620} NOKEYCHECK=True GitOrigin-RevId: 80493f1787a837794c5557ec29390c1573a03930
1 parent ca7ae04 commit 52690b9

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build_bindgen.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
MaybeDownloadHostGcc, RunCommand)
2929
from update import (RmTree)
3030

31-
# The git hash to use. This is the `v0.60.0` tag.
32-
BINDGEN_GIT_VERSION = '355181134094202e0caae60c1fbf145d8e6ca84b'
31+
# The git hash to use.
32+
BINDGEN_GIT_VERSION = '078fb77e82507c1b96f571a18700a03870c96fdd'
3333
BINDGEN_GIT_REPO = ('https://chromium.googlesource.com/external/' +
3434
'github.com/rust-lang/rust-bindgen')
3535

@@ -221,7 +221,7 @@ def main():
221221
f'--target-dir={build_dir}',
222222
f'--target={RustTargetTriple(args.build_mac_arm)}',
223223
f'--no-default-features',
224-
f'--features=clap,logging',
224+
f'--features=logging',
225225
'--release',
226226
'--bin',
227227
'bindgen',

update_rust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# These fields are written by //tools/clang/scripts/upload_revision.py, and
3434
# should not be changed manually.
3535
RUST_REVISION = 'ac4379fea9e83465d814bb05005689f49bd2141e'
36-
RUST_SUB_REVISION = 5
36+
RUST_SUB_REVISION = 7
3737

3838
# Trunk on 2022-10-15.
3939
#
@@ -65,7 +65,7 @@
6565
# TODO(lukasza): Include CRUBIT_REVISION and CRUBIT_SUB_REVISION once we
6666
# include Crubit binaries in the generated package. See also a TODO comment
6767
# in BuildCrubit in package_rust.py.
68-
FALLBACK_REVISION = 'ac4379fea9e83465d814bb05005689f49bd2141e-5-llvmorg-17-init-3874-g93a2fecc-1'
68+
FALLBACK_REVISION = 'ac4379fea9e83465d814bb05005689f49bd2141e-7-llvmorg-17-init-3874-g93a2fecc-1'
6969

7070
# Hash of src/stage0.json, which itself contains the stage0 toolchain hashes.
7171
# We trust the Rust build system checks, but to ensure it is not tampered with

0 commit comments

Comments
 (0)