bypass linker configuration and cross target check on `x check`#140357

onur-ozkan · 2025-04-27T07:22:01Z

I was going to handle this using the untracked env approach, but I realized it somehow doesn't regress #130108 anymore...

Anyway, if it works, it works. 😄 No need to dig deeper but my guess is we moved some cache-invalidating env from these functions to others.

Fixes #133840

try-job: aarch64-apple

Signed-off-by: onur-ozkan <work@onurozkan.dev>

rustbot · 2025-04-27T07:22:05Z

r? @clubby789

rustbot has assigned @clubby789.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

src/bootstrap/src/core/builder/cargo.rs

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2025-05-04T12:25:52Z

Rerolling due to inactivity. r? bootstrap

clubby789 · 2025-05-04T12:34:30Z

🥲 Sorry, I typed out an r=me when green but guess I forgot to hit comment

@bors r+ rollup

bors · 2025-05-04T12:34:33Z

📌 Commit 7669d50 has been approved by clubby789

It is now in the queue for this repository.

bypass linker configuration and cross target check on `x check` I was going to handle this using the untracked env approach, but I realized it somehow doesn't regress rust-lang#130108 anymore... Anyway, if it works, it works. 😄 No need to dig deeper but my guess is we moved some cache-invalidating env from these functions to others. Fixes rust-lang#133840

Rollup of 3 pull requests Successful merges: - rust-lang#140357 (bypass linker configuration and cross target check on `x check`) - rust-lang#140580 (Don't name variables from external macros in borrow errors.) - rust-lang#140630 (Async drop source info fix for proxy-drop-coroutine) r? `@ghost` `@rustbot` modify labels: rollup

jieyouxu · 2025-05-04T14:40:52Z

Failed in rollup on aarch64-apple:

2025-05-04T14:02:40.9144850Z failures:
2025-05-04T14:02:40.9145110Z 
2025-05-04T14:02:40.9145350Z ---- utils::cc_detect::tests::test_find stdout ----
2025-05-04T14:02:40.9145610Z 
2025-05-04T14:02:40.9145950Z thread 'utils::cc_detect::tests::test_find' panicked at src/bootstrap/src/utils/cc_detect/tests.rs:272:9:
2025-05-04T14:02:40.9146440Z CC not set for target x86_64-unknown-linux-gnu
2025-05-04T14:02:40.9146660Z 
2025-05-04T14:02:40.9146660Z 
2025-05-04T14:02:40.9146790Z failures:
2025-05-04T14:02:40.9147090Z     utils::cc_detect::tests::test_find

@bors r-

clubby789 · 2025-05-04T15:12:34Z

This:

rust/src/bootstrap/src/utils/cc_detect/tests.rs

Line 265 in 62c5f58

    
           let mut build = Build::new(Config { ..Config::parse(Flags::parse(&["check".to_owned()])) });

and other instances may need to be changed to "build" now?

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2025-05-05T10:36:14Z

This:

rust/src/bootstrap/src/utils/cc_detect/tests.rs

Line 265 in 62c5f58

let mut build = Build::new(Config { ..Config::parse(Flags::parse(&["check".to_owned()])) });

and other instances may need to be changed to "build" now?

Yeah, seems like.

onur-ozkan · 2025-05-05T10:37:33Z

@bors try

bypass linker configuration and cross target check on `x check` I was going to handle this using the untracked env approach, but I realized it somehow doesn't regress rust-lang#130108 anymore... Anyway, if it works, it works. 😄 No need to dig deeper but my guess is we moved some cache-invalidating env from these functions to others. Fixes rust-lang#133840 try-job: aarch64-apple

bors · 2025-05-05T10:38:47Z

⌛ Trying commit a8f7fd1 with merge 0e3a7e6...

bors · 2025-05-05T11:54:04Z

☀️ Try build successful - checks-actions
Build commit: 0e3a7e6 (0e3a7e6b305ca2692791fbb1cc43893ac1a64fe2)

onur-ozkan · 2025-05-05T12:24:12Z

@bors r=clubby789

bors · 2025-05-05T12:24:14Z

📌 Commit a8f7fd1 has been approved by clubby789

It is now in the queue for this repository.

bypass linker configuration and cross target check on `x check` I was going to handle this using the untracked env approach, but I realized it somehow doesn't regress rust-lang#130108 anymore... Anyway, if it works, it works. 😄 No need to dig deeper but my guess is we moved some cache-invalidating env from these functions to others. Fixes rust-lang#133840 try-job: aarch64-apple

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#139764 (Consistent trait bounds for ExtractIf Debug impls) - rust-lang#140035 (Implement RFC 3503: frontmatters) - rust-lang#140080 (mir-opt: Use one MirPatch in MatchBranchSimplification) - rust-lang#140115 (mir-opt: execute MatchBranchSimplification after GVN) - rust-lang#140357 (bypass linker configuration and cross target check on `x check`) - rust-lang#140374 (Resolve instance for SymFn in global/naked asm) - rust-lang#140393 (std: get rid of `sys_common::process`) - rust-lang#140532 (Fix RustAnalyzer discovery of rustc's `stable_mir` crate) - rust-lang#140559 (Removing rustc_type_ir in the rustc_infer codebase) - rust-lang#140636 (implement `PanicTracker` to track `t` panics) - rust-lang#140661 (Make `-Zfixed-x18` into a target modifier) r? `@ghost` `@rustbot` modify labels: rollup

…llaumeGomez Rollup of 11 pull requests Successful merges: - rust-lang#140080 (mir-opt: Use one MirPatch in MatchBranchSimplification) - rust-lang#140115 (mir-opt: execute MatchBranchSimplification after GVN) - rust-lang#140357 (bypass linker configuration and cross target check on `x check`) - rust-lang#140374 (Resolve instance for SymFn in global/naked asm) - rust-lang#140559 (Removing rustc_type_ir in the rustc_infer codebase) - rust-lang#140605 (`fn check_opaque_type_parameter_valid` defer error) - rust-lang#140636 (implement `PanicTracker` to track `t` panics) - rust-lang#140661 (Make `-Zfixed-x18` into a target modifier) - rust-lang#140670 (calculate step duration in a panic-safe way) - rust-lang#140672 (Deeply normalize in the new solver in WF) - rust-lang#140676 (Update books) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#140357 - onur-ozkan:133840, r=clubby789 bypass linker configuration and cross target check on `x check` I was going to handle this using the untracked env approach, but I realized it somehow doesn't regress rust-lang#130108 anymore... Anyway, if it works, it works. 😄 No need to dig deeper but my guess is we moved some cache-invalidating env from these functions to others. Fixes rust-lang#133840 try-job: aarch64-apple

bypass linker configuration and cross target check on x check

8290766

Signed-off-by: onur-ozkan <work@onurozkan.dev>

rustbot assigned clubby789 Apr 27, 2025

rustbot added 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) labels Apr 27, 2025

clubby789 reviewed Apr 27, 2025

View reviewed changes

src/bootstrap/src/core/builder/cargo.rs Outdated Show resolved Hide resolved

add a FIXME

7669d50

Signed-off-by: onur-ozkan <work@onurozkan.dev>

rustbot assigned albertlarsan68 and unassigned clubby789 May 4, 2025

bors 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 May 4, 2025

Zalathar mentioned this pull request May 4, 2025

Rollup of 3 pull requests #140635

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 4, 2025

update cc_detect tests

a8f7fd1

Signed-off-by: onur-ozkan <work@onurozkan.dev>

bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 5, 2025

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 5, 2025

GuillaumeGomez mentioned this pull request May 5, 2025

Rollup of 11 pull requests #140674

Closed

GuillaumeGomez mentioned this pull request May 5, 2025

Rollup of 11 pull requests #140682

Merged

bors merged commit 246acdb into rust-lang:master May 6, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone May 6, 2025

onur-ozkan deleted the 133840 branch May 6, 2025 05:25

Uh oh!

Conversation

onur-ozkan commented Apr 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Apr 27, 2025

Uh oh!

Uh oh!

onur-ozkan commented May 4, 2025

Uh oh!

clubby789 commented May 4, 2025

Uh oh!

bors commented May 4, 2025

Uh oh!

jieyouxu commented May 4, 2025

Uh oh!

clubby789 commented May 4, 2025

Uh oh!

onur-ozkan commented May 5, 2025

Uh oh!

onur-ozkan commented May 5, 2025

Uh oh!

bors commented May 5, 2025

Uh oh!

bors commented May 5, 2025

Uh oh!

onur-ozkan commented May 5, 2025

Uh oh!

bors commented May 5, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

onur-ozkan commented Apr 27, 2025 •

edited

Loading