Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

resolve llvm-config path properly on cross builds #136681

Merged
merged 2 commits into from
Feb 10, 2025
Merged

resolve llvm-config path properly on cross builds #136681

merged 2 commits into from
Feb 10, 2025

Conversation

onur-ozkan
Copy link
Member

@onur-ozkan onur-ozkan commented Feb 7, 2025 •
edited
Loading

Fixes #132926

try-job: x86_64-mingw-2

@rustbot
Copy link
Collaborator

rustbot commented Feb 7, 2025

r? @jieyouxu

rustbot has assigned @jieyouxu.
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

@rustbot 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 Feb 7, 2025
@rustbot

This comment was marked as off-topic.

# to view
jieyouxu

This comment was marked as outdated.

# to view

@jieyouxu
Copy link
Member

jieyouxu commented Feb 7, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 7, 2025

📌 Commit 7aad871 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Feb 7, 2025
@onur-ozkan
Copy link
Member Author

@bors r-

@bors 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 Feb 7, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Feb 7, 2025 •
edited
Loading

Oh hang on, the original report may be a situation where they have separate (build, host, target) targets and build != host 🤔

@jieyouxu jieyouxu dismissed their stale review February 7, 2025 17:51

outdated

@onur-ozkan
resolve llvm-config path properly on cross builds
4b8b18f 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 8, 2025
@onur-ozkan onur-ozkan changed the title replace bootstrap host with target triple for LLVM resolve llvm-config path properly on cross builds Feb 8, 2025
jieyouxu
jieyouxu approved these changes Feb 8, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, AFAICT this is correct, where if we have a (build, host, target) configuration where build != host, we consult build platform llvm-config.

@jieyouxu
Copy link
Member

jieyouxu commented Feb 8, 2025

@bors r+

@bors
Copy link
Contributor

bors commented Feb 8, 2025

📌 Commit 949c9c4 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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 Feb 8, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Feb 8, 2025
@workingjubilee
Rollup merge of rust-lang#136681 - onur-ozkan:132926, r=jieyouxu
540d098 
resolve `llvm-config` path properly on cross builds

Fixes rust-lang#132926
@workingjubilee workingjubilee mentioned this pull request Feb 8, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 9, 2025
@bors
Auto merge of rust-lang#136681 - onur-ozkan:132926, r=<try>
f50c84c 
resolve `llvm-config` path properly on cross builds

Fixes rust-lang#132926

try-job: x86_64-mingw-2
@bors
Copy link
Contributor

bors commented Feb 9, 2025

⌛ Trying commit a6511b8 with merge f50c84c...

@rust-log-analyzer

This comment has been minimized.

# to view
@bors
Copy link
Contributor

bors commented Feb 9, 2025

💔 Test failed - checks-actions

@jieyouxu
Copy link
Member

jieyouxu commented Feb 9, 2025 

2025-02-09T10:19:20.0899190Z thread 'core::builder::tests::test_prebuilt_llvm_config_path_resolution' panicked at src\bootstrap\src\core\builder\tests.rs:914:5:
2025-02-09T10:19:20.0900110Z assertion `left == right` failed
2025-02-09T10:19:20.0900491Z   left: "/some/path/to/llvm-config"
2025-02-09T10:19:20.0900895Z  right: "D:/some/path/to/llvm-config"

@onur-ozkan onur-ozkan force-pushed the 132926 branch 2 times, most recently from fe4fb79 to 58e625d Compare February 10, 2025 09:18
@onur-ozkan
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Feb 10, 2025

⌛ Trying commit 58e625d with merge cc77d9c...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
@bors
Auto merge of rust-lang#136681 - onur-ozkan:132926, r=<try>
cc77d9c 
resolve `llvm-config` path properly on cross builds

Fixes rust-lang#132926

try-job: x86_64-mingw-2
@rust-log-analyzer

This comment has been minimized.

# to view
@bors
Copy link
Contributor

bors commented Feb 10, 2025

💔 Test failed - checks-actions

@onur-ozkan
add coverage for llvm-config path resolution
e07e335 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
Copy link
Member Author

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
@bors
Auto merge of rust-lang#136681 - onur-ozkan:132926, r=<try>
f7625af 
resolve `llvm-config` path properly on cross builds

Fixes rust-lang#132926

try-job: x86_64-mingw-2
@bors
Copy link
Contributor

bors commented Feb 10, 2025

⌛ Trying commit e07e335 with merge f7625af...

@bors
Copy link
Contributor

bors commented Feb 10, 2025

☀️ Try build successful - checks-actions
Build commit: f7625af (f7625af0badee06da35dd500b4290d106733f1d2)

jieyouxu
jieyouxu approved these changes Feb 10, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks

@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 10, 2025

📌 Commit e07e335 has been approved by jieyouxu

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 10, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 10, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
@bors
Auto merge of rust-lang#136823 - matthiaskrgr:rollup-vp20mk1, r=matth…
4bb6ec0 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#136419 (adding autodiff tests)
 - rust-lang#136628 (ci: upgrade to crosstool-ng 1.27.0)
 - rust-lang#136681 (resolve `llvm-config` path properly on cross builds)
 - rust-lang#136714 (Update `compiler-builtins` to 0.1.146)
 - rust-lang#136731 (rustc_middle: parallel: TyCtxt: remove "unsafe impl DynSend/DynSync")
 - rust-lang#136791 (Disable DWARF in linker options for i686-unknown-uefi)

Failed merges:

 - rust-lang#136767 (improve host/cross target checking)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2becd0b into rust-lang:master Feb 10, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 10, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
@rust-timer
Unrolled build for rust-lang#136681
2b4301d 
Rollup merge of rust-lang#136681 - onur-ozkan:132926, r=jieyouxu

resolve `llvm-config` path properly on cross builds

Fixes rust-lang#132926

try-job: x86_64-mingw-2
@onur-ozkan onur-ozkan deleted the 132926 branch February 20, 2025 06:59
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

build and target aren't distinguished during llvm building
7 participants
@onur-ozkan @rustbot @jieyouxu @bors @workingjubilee @rust-log-analyzer @bjorn3