Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784

Merged
bors merged 6 commits into
rust-lang:masterfrom
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged

Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom
madsmtm:bootstrap-bump-cc-cmake

Conversation

@madsmtm

@madsmtmmadsmtm commented Mar 21, 2025•
edited
Loading

Copy link
Copy Markdown
Member

The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.

See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.

r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap
try-job: apple

@rustbotrustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm closed this Mar 21, 2025
@madsmtmmadsmtm reopened this Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm closed this Mar 21, 2025
@madsmtmmadsmtm reopened this Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol

Kobzol commented Mar 21, 2025

Copy link
Copy Markdown
Member

Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.

@madsmtm
madsmtmforce-pushed the bootstrap-bump-cc-cmake branch from 85502fc to 673b519CompareMarch 21, 2025 17:14
@madsmtm

madsmtm commented Mar 21, 2025•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).

Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try

@Kobzol

Kobzol commented Mar 21, 2025

Copy link
Copy Markdown
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors

bors commented Mar 21, 2025

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 673b519 with merge dbfe100...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Mar 21, 2025

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 21, 2025
@jieyouxu

jieyouxu commented Mar 22, 2025

Copy link
Copy Markdown
Member

@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)

@bors

bors commented Mar 22, 2025

Copy link
Copy Markdown
Collaborator

✌️ @madsmtm, you can now approve this pull request!

If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu

@madsmtm
madsmtmforce-pushed the bootstrap-bump-cc-cmake branch from ce6caef to c93efd1CompareMarch 22, 2025 04:47
@madsmtm

madsmtm commented Mar 22, 2025•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).

@bors try

@madsmtm
madsmtmforce-pushed the bootstrap-bump-cc-cmake branch from c93efd1 to 061eda1CompareMarch 22, 2025 04:47
@bors

bors commented Mar 22, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 061eda1 with merge 77ad7c5...

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm

madsmtm commented Mar 28, 2025•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?

EDIT:
@rustbot ready

@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed the bootstrap-bump-cc-cmake branch from 81ac7b4 to 7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 28, 2025
jieyouxu
jieyouxu approved these changes Mar 28, 2025
View reviewed changes

@jieyouxujieyouxu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.

I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.

@jieyouxu

jieyouxu commented Mar 28, 2025

Copy link
Copy Markdown
Member

@bors r+ rollup=never

@bors

bors commented Mar 28, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 7a6a324 has been approved by jieyouxu

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 28, 2025
@bors

bors commented Mar 29, 2025

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7a6a324 with merge 2848101...

@bors

bors commented Mar 29, 2025

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 2848101 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 29, 2025
@bors
bors merged commit 2848101 into rust-lang:masterMar 29, 2025
@rustbotrustbot added this to the 1.87.0 milestone Mar 29, 2025
@github-actions

github-actionsBot commented Mar 29, 2025

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)

Test differences

Show 1 test diff

Stage 2

  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)

Job group index

  • J0: x86_64-gnu-nopt

Job duration changes

  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer

rust-timer commented Mar 29, 2025

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (2848101): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)

@madsmtm
madsmtm deleted the bootstrap-bump-cc-cmake branch March 29, 2025 14:27
@borsbors mentioned this pull request Mar 31, 2025
Closed
@jieyouxujieyouxu mentioned this pull request Apr 3, 2025
Closed
@madsmtmmadsmtm mentioned this pull request May 11, 2025
Closed
@jieyouxujieyouxu mentioned this pull request Mar 14, 2026
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Bump boostrap cc to 1.2.17 and cmake to 0.1.54 - #138784
Merged
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Mar 29, 2025
Merged
Bump boostrap cc to 1.2.17 and cmake to 0.1.54#138784
bors merged 6 commits into
rust-lang:masterfrom 
madsmtm:bootstrap-bump-cc-cmake
Conversation
@madsmtm
@madsmtmmadsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

Member
The cc version in bootstrap was reverted down to 1.1.22 in #137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of cc has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See the cc-rs changelog and the cmake-rs changelog for details on what has changed here.
r? jieyouxu who tried this last in #137022.
@rustbot label T-bootstrap

try-job: apple
@rustbotrustbot
added

A-testsuite
Area: The testsuite used to check the correctness of rustc
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
T-bootstrap
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
T-infra
Relevant to the infrastructure team, which will review and decide on the PR/issue.
labels
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@madsmtmmadsmtm
closed this
Mar 21, 2025
@madsmtmmadsmtm
reopened this
Mar 21, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
Please add try-job: dist-apple-various to the PR description and run a try build (@bors try). The dist jobs might not run on PR CI.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
85502fc to
673b519CompareMarch 21, 2025 17:14
@madsmtm
madsmtm
commented
Mar 21, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Ah, that's why, I really couldn't understand why it didn't work (and failing in sccache looked very much like a spurious network error or something).
Have added to try-job to the description, though pretty sure I don't have permissions to do @bors try. Let's try:
@bors try
@Kobzol
Kobzol
commented
Mar 21, 2025

Copy link


Copy Markdown

Member
@bors try
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=<…
dbfe100
…try>
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
⌛ Trying commit 673b519 with merge dbfe100...
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
bors
commented
Mar 21, 2025

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
added

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 21, 2025
@jieyouxu
jieyouxu
commented
Mar 22, 2025

Copy link


Copy Markdown

Member
@bors delegate+ (for try-jobs only, I haven't looked at the cc diff)
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
✌️ @madsmtm, you can now approve this pull request!
If @jieyouxu told you to "r=me" after making some further change, please make that change, then do @bors r=@jieyouxu
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
ce6caef to
c93efd1CompareMarch 22, 2025 04:47
@madsmtm
madsmtm
commented
Mar 22, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Okay so the failure comes from all the way back in rust-lang/cmake-rs#158, see also rust-lang/cmake-rs#228. I've added a workaround in bootstrap, though ideally this should be fixed in cmake-rs proper (but it requires target parsing to do correctly... So I'm hesitant to attempt it yet).
@bors try
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
c93efd1 to
061eda1CompareMarch 22, 2025 04:47
@bors
bors
commented
Mar 22, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 061eda1 with merge 77ad7c5...
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2025
@bors
Auto merge ofrust-lang#138784- madsmtm:bootstrap-bump-cc-cmake, r=
77ad7c5
Bump boostrap `cc` to 1.2.17 and `cmake` to 0.1.54
The `cc` version in `bootstrap` was reverted down to 1.1.22 in rust-lang#137460 (previously at 1.2.0). The offending issue has since then been resolved in rust-lang/cc-rs#1413, and a new version of `cc` has been released in rust-lang/cc-rs#1435, so let's try to update the version again.
See [the changelog](https://github.com/rust-lang/cc-rs/blob/d9dd20e376368c7535f6ef89b809098f5f203c1a/CHANGELOG.md) for exact details on what has changed here.
r? jieyouxu who tried this last in rust-lang#137022.
`@rustbot` label T-bootstrap
try-job: dist-apple-various
@rust-log-analyzer

This comment has been minimized.

Sign in to view
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#139015
26373f0
Rollup merge of rust-lang#139015 - Kobzol:llvm-ci-test-fixes, r=onur-ozkan
Remove unneeded LLVM CI test assertions
The `download_ci_llvm` bootstrap test was checking implementation details of the LLVM CI download check, which isn't very useful. It was essentially testing "if function_that_checks_if_llvm_ci_is_available returns true, we enable CI LLVM", but the usage of the function was an implementation detail. After rust-lang#138704, the inner implementation has changed, so the test now breaks if LLVM is updated.
I don't think that it's very useful to test implementation details like this, without taking the outside git state into account. Ideally, we should mock the git state for the test, otherwise the test will randomly break when executed in environments which the test does not control (e.g. on CI when a LLVM change happens).
I only kept the part of the test that checks that LLVM CI isn't used when we specify `download-ci-llvm = false`, as that should hold under all conditions, CI/local, and all git states.
I also kept the `if-unchanged` assertion, but only on CI, and as a temporary measure. After rust-lang#138591, we should have a proper way of mocking the git state to make the test robust, and make it test what we actually want.
Fixes [this](rust-lang#138784 (comment)).
r? `@ghost`
@madsmtm
madsmtm
commented
Mar 28, 2025•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
Uh, I think this got closed by the "fixes" sentence in that PR, and I can't re-open it myself. Can someone else do that, or should I make a new PR?
EDIT:
@rustbot ready
@madsmtm
bootstrap: bump cc to 1.2.17 and cmake to 0.1.54
c83504f
@madsmtm
bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling
9cf05b8
To avoid a panic in cmake-rs that was introduced in:
rust-lang/cmake-rs#158
@madsmtm
bootstrap: Fix CMAKE_OSX_ARCHITECTURES on all Apple platforms
a9cb15d
@madsmtm
bootstrap: Set CMAKE_SYSTEM_NAME=Darwin on Apple platforms
e8704e8
compiler-rt's CMake setup seems to have special logic for Apple
platforms that works poorly when this is not set.
@madsmtm
bootstrap: Override CMAKE_OSX_SYSROOT when building compiler-rt
011eabd
Similarly to what was previously done for the `llvm` step.
@madsmtm
bootstrap: Update download-ci-llvm-stamp
7a6a324
This PR makes a fairly large version update to CMake and cc, so it is
likely that LLVM is built differently.
@madsmtm
madsmtmforce-pushed
the
bootstrap-bump-cc-cmake
branch
from
81ac7b4 to
7a6a324CompareMarch 28, 2025 03:16
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-blocked
Status: Blocked on something else such as an RFC or other implementation work.
labels
Mar 28, 2025
jieyouxu
jieyouxu
approved these changes
Mar 28, 2025
View reviewed changes
@jieyouxujieyouxu
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It is indeed very nice if we no longer have to pin bootstrap cc/cmake to old versions that are quite a ways away from the compiler cc versions.
I'm semi-expecting this to maybe cause issues in obscure cases, so I'm going to mark this as rollup-never for bisection purposes, but we should definitely try this.
@jieyouxu
jieyouxu
commented
Mar 28, 2025

Copy link


Copy Markdown

Member
@bors r+ rollup=never
@bors
bors
commented
Mar 28, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 7a6a324 has been approved by jieyouxu
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 28, 2025
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 7a6a324 with merge 2848101...
@bors
bors
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
☀️ Test successful - checks-actions

Approved by: jieyouxu

Pushing 2848101 to master...
@borsbors
added
the 
merged-by-bors
This PR was explicitly merged by bors.
label
Mar 29, 2025
@bors
bors
merged commit 2848101
into
rust-lang:masterMar 29, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 29, 2025
@github-actions
github-actionsBot
commented
Mar 29, 2025

Copy link


Copy Markdown

Contributor
What is this?
This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 920d95e (parent) -> 2848101 (this PR)
Test differences
Show 1 test diff

Stage 2
  • [run-make] tests/run-make/compressed-debuginfo-zstd: pass -> ignore (ignored if LLVM wasn't build with zstd for ELF section compression (we want LLVM/LLD to be built with zstd support)) (J0)
Job group index
  • J0: x86_64-gnu-nopt
Job duration changes
  1. aarch64-apple: 4007.5s -> 11255.0s (180.8%)
  2. x86_64-apple-2: 4351.2s -> 7809.2s (79.5%)
  3. dist-armv7-linux: 5383.2s -> 9636.3s (79.0%)
  4. x86_64-rust-for-linux: 2678.2s -> 4060.4s (51.6%)
  5. mingw-check: 1271.9s -> 1801.1s (41.6%)
  6. test-various: 4236.9s -> 5826.9s (37.5%)
  7. armhf-gnu: 4496.4s -> 6107.3s (35.8%)
  8. x86_64-apple-1: 7999.4s -> 10793.6s (34.9%)
  9. x86_64-gnu: 6298.4s -> 8478.0s (34.6%)
  10. x86_64-gnu-nopt: 5522.8s -> 7339.5s (32.9%)
How to interpret the job duration changes?
Job durations can vary a lot, based on the actual runner instance

that executed the job, system noise, invalidated caches, etc. The table above is provided

mostly for t-infra members, for simpler debugging of potential CI slow-downs.
@rust-timer
rust-timer
commented
Mar 29, 2025

Copy link


Copy Markdown

Collaborator
Finished benchmarking commit (2848101): comparison URL.
Overall result: no relevant changes - no action needed
@rustbot label: -perf-regression
Instruction count
This benchmark run did not return any relevant results for this metric.
Max RSS (memory usage)
This benchmark run did not return any relevant results for this metric.
Cycles
This benchmark run did not return any relevant results for this metric.
Binary size
This benchmark run did not return any relevant results for this metric.
Bootstrap: 777.624s -> 778.59s (0.12%)
Artifact size: 365.96 MiB -> 365.95 MiB (-0.00%)
@madsmtm
madsmtm
deleted the

bootstrap-bump-cc-cmake

branch
March 29, 2025 14:27
@borsbors
mentioned this pull request
Mar 31, 2025
 Closed

@jieyouxujieyouxu
mentioned this pull request
Apr 3, 2025

Closed

@madsmtmmadsmtm
mentioned this pull request
May 11, 2025

Closed

@jieyouxujieyouxu
mentioned this pull request
Mar 14, 2026
 Open

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@jieyouxujieyouxujieyouxu approved these changes

Assignees

@jieyouxujieyouxu

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

9 participants

@madsmtm@rust-log-analyzer@Kobzol@bors@jieyouxu@rustbot@klensy@rust-timer@ChrisDenton