Skip to content

Commit d6935c2

Browse files
ZequanWucopybara-github
authored andcommitted
Workaround for rust output filename collision.
Verified this fix the problem in rust-lang/cargo#14253 (comment). Bug: 356618943 Change-Id: I8fd7fb3cd221169bc6b6fd62dc8dacb20540f076 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5762945 Reviewed-by: Arthur Eubanks <[email protected]> Commit-Queue: Arthur Eubanks <[email protected]> Cr-Commit-Position: refs/heads/main@{#1338074} NOKEYCHECK=True GitOrigin-RevId: 3bbeefab80402469d4cfaa1ad9b26fa76c93b659
1 parent 292a940 commit d6935c2

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

build_rust.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,16 @@ def main():
774774
# changes that move submodules.
775775
GitApplyCherryPicks()
776776

777+
# TODO(crbug.com/356618943): Workaround for https://github.com/rust-lang/cargo/issues/14253
778+
bootstrap_cargo = os.path.join(RUST_SRC_DIR, 'src', 'bootstrap',
779+
'Cargo.toml')
780+
with open(bootstrap_cargo, 'r') as f:
781+
lines = f.readlines()
782+
with open(bootstrap_cargo, 'w') as f:
783+
for l in lines:
784+
if l.strip('\n') != 'debug = 0':
785+
f.write(l)
786+
777787
CargoVendor(cargo_bin)
778788

779789
# Gnrt needs the checkout to be up-to-date, workspace submodules to be

0 commit comments

Comments
 (0)