Skip to content

Commit 5acd939

Browse files
alanzhao1copybara-github
authored andcommitted
Reland "Remove compiler-rt, profile and sanitizers when using --no-runtimes"
This reverts commit a59656697102de059e44e548c08d3a711eff6a0d. Reason for revert: This was not the cause of the mac-official build failure. That build failure looks like a flake after redoing the build locally. Original change's description: > Revert "Remove compiler-rt, profile and sanitizers when using --no-runtimes" > > This reverts commit ba8ba3276065824bd1827a994995ad169727ae74. > > Reason for revert: Chromium gardener failures found on https://ci.chromium.org/ui/p/chromium/builders/ci/mac-official/9582/ > > Original change's description: > > Remove compiler-rt, profile and sanitizers when using --no-runtimes > > > > The flag removes the compiler-rt runtime from the build, as well as > > the profile and sanitizers runtimes, as they are not needed for building > > the Rust toolchain and are distributed with the C++ toolchain. > > > > This makes the Rust toolchain builds a bit faster. > > > > One exception is that MacOS always needs compiler-rt in order to link > > LLVM binaries, so it's not removed on MacOS. > > > > Bug: 40212971 > > Change-Id: I49f3f65c2b6389dadd97daf931174fef67c42abe > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5893987 > > Commit-Queue: danakj <[email protected]> > > Commit-Queue: Arthur Eubanks <[email protected]> > > Auto-Submit: danakj <[email protected]> > > Reviewed-by: Arthur Eubanks <[email protected]> > > Cr-Commit-Position: refs/heads/main@{#1361305} > > Bug: 40212971 > Change-Id: I29966dd0593d9f76463c85c04ab48d3fd3339d70 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5895660 > Commit-Queue: Shibalik Mohapatra <[email protected]> > Bot-Commit: Rubber Stamper <[email protected]> > Owners-Override: Shibalik Mohapatra <[email protected]> > Cr-Commit-Position: refs/heads/main@{#1361394} Bug: 40212971 Change-Id: I92f3c853e55d1a397f258bda5e6ca67315121db5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5896592 Reviewed-by: Shibalik Mohapatra <[email protected]> Bot-Commit: Rubber Stamper <[email protected]> Commit-Queue: Alan Zhao <[email protected]> Cr-Commit-Position: refs/heads/main@{#1361456} NOKEYCHECK=True GitOrigin-RevId: b8ea40f2076c2b80af902fc6294a22cb173753e5
1 parent 1bcb13f commit 5acd939

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

build_rust.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,7 @@ def BuildLLVMLibraries(skip_build):
538538
os.path.join(CLANG_SCRIPTS_DIR, 'build.py'),
539539
'--disable-asserts',
540540
'--no-tools',
541+
'--no-runtimes',
541542
# PIC needed for Rust build (links LLVM into shared object)
542543
'--pic',
543544
'--with-ml-inliner-model=',

update_rust.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# These fields are written by //tools/clang/scripts/upload_revision.py, and
3333
# should not be changed manually.
3434
RUST_REVISION = '009e73825af0e59ad4fc603562e038b3dbd6593a'
35-
RUST_SUB_REVISION = 2
35+
RUST_SUB_REVISION = 22
3636

3737
# Trunk on 2022-10-15.
3838
#

0 commit comments

Comments
 (0)