3

Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly. by inferiorhumano...

 1 year ago
source link: https://github.com/rust-lang/rust/pull/113996
Go to the source link to view the article. You can view the picture content, updated content and better typesetting reading experience. If the link is broken, please click the button below to view the snapshot at that time.
neoserver,ios ssh client

Conversation

Without CMAKE_SYSTEM_NAME set to the target a cross compile will generally fail. Related to #109170.

Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

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

Jul 24, 2023

Collaborator

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

Given that this list is likely a.) not complete and b.) will grow over time, would it make sense to call splitn on target and turn this into a match statement instead?

inferiorhumanorgans

changed the title bootstrap: Define CMake platform if DragonFly.

Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly.

Jul 24, 2023

Member

would it make sense to call splitn on target and turn this into a match statement instead?

I don't think it makes any difference since it's still a string comparison

ozkanonur

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

Jul 24, 2023

would it make sense to call splitn on target and turn this into a match statement instead?

I don't think it makes any difference since it's still a string comparison

Ah I was thinking mainly in terms of legibility, however that wouldn't account for platforms where the triplet is actually a quadruplet (e.g. linux-musl or windows-msvc).

Anyways the other thing that comes to mind is printing a warning if CMAKE_SYSTEM_NAME is left undefined e.g.

} else {
    eprintln!("could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail")
}

Member

Anyways the other thing that comes to mind is printing a warning if CMAKE_SYSTEM_NAME is left undefined e.g.

} else {
    eprintln!("could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail")
}

This seems better. Can you add that else block which prints this information with builder.info instead of eprintln? Once this is done with squashing the commits into single one, we can land this :)

Member

Thanks a lot!

@bors r+ rollup

inferiorhumanorgans reacted with hooray emoji

Contributor

๐Ÿ“Œ Commit a0538db has been approved by ozkanonur

It is now in the queue for this repository.

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

Jul 25, 2023

Contributor

hourglass Testing commit a0538db with merge 2395c22...

Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

Contributor

๐Ÿ’” Test failed - checks-actions

bors

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

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

labels

Jul 25, 2023

Member

Seems like a regression from #113514 similar to #113798

Member

a fix PR was merged #114062

@bors retry

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

Jul 26, 2023

bors

merged commit 998fd94 into

rust-lang:master

Jul 26, 2023

11 of 12 checks passed

rust-timer

added a commit to rust-lang-ci/rust that referenced this pull request

Jul 26, 2023

inferiorhumanorgans

deleted the dragonfly-cmake-system-name branch

August 1, 2023 10:19

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

Reviewers

ozkanonur

ozkanonur approved these changes
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.73.0

Development

Successfully merging this pull request may close these issues.

None yet

5 participants

About Joyk


Aggregate valuable and interesting links.
Joyk means Joy of geeK