Skip to content

Commit 1c775e9

Browse files
danakjAravind Vasudevan
authored andcommitted
Make upload_revision with Rust quick again
The --verify-stage0-hash flag was being executed in build_rust.py after doing a bunch of git checkout and LLVM building, it should be a fast return. Since the upload_revision script already checked out the Rust git repo it can also --skip-checkout. Bug: 1401042 Change-Id: Idc9333fb0abbc3a5e0b549f1fc04cbc8fef9dc3b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4366658 Reviewed-by: Zequan Wu <[email protected]> Commit-Queue: danakj <[email protected]> Cr-Commit-Position: refs/heads/main@{#1121193} NOKEYCHECK=True GitOrigin-RevId: 3798deeaeea0f95642b3d8adcbc39f4746d6b3f2
1 parent 3d5fc8e commit 1c775e9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

build_rust.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -633,18 +633,18 @@ def main():
633633
if not args.skip_checkout:
634634
CheckoutGitRepo('Rust', RUST_GIT_URL, checkout_revision, RUST_SRC_DIR)
635635

636-
(x86_64_llvm_config, aarch64_llvm_config,
637-
target_llvm_dir) = BuildLLVMLibraries(args.skip_llvm_build,
638-
args.build_mac_arm,
639-
args.gcc_toolchain)
640-
641636
VerifyStage0JsonHash()
642637
if args.verify_stage0_hash:
643638
# The above function exits and prints the actual hash if verification
644639
# failed so we just quit here; if we reach this point, the hash is
645640
# valid.
646641
return 0
647642

643+
(x86_64_llvm_config, aarch64_llvm_config,
644+
target_llvm_dir) = BuildLLVMLibraries(args.skip_llvm_build,
645+
args.build_mac_arm,
646+
args.gcc_toolchain)
647+
648648
AddCMakeToPath()
649649

650650
# Require zlib compression.

0 commit comments

Comments
 (0)