Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix build on Solaris where fd-lock cannot be used. #113048

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Fix build on Solaris where fd-lock cannot be used. #113048

merged 1 commit into from
Jun 29, 2023

Conversation

psumbera
Copy link
Contributor

@psumbera psumbera commented Jun 26, 2023 •
edited by onur-ozkan
Loading

This fixes build regression after e7e584b.

Resolves #113085

@rustbot
Copy link
Collaborator

rustbot commented Jun 26, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@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 Jun 26, 2023
onur-ozkan
onur-ozkan requested changes Jun 26, 2023
View reviewed changes
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

Thank you for the PR :)

I haven't tested this. I will try to test it during this week. Adding a reference to the problem/error that this PR fix would be great.

src/bootstrap/bin/main.rs Outdated Show resolved Hide resolved
src/bootstrap/bin/main.rs Outdated Show resolved Hide resolved
@onur-ozkan
Copy link
Member

@rustbot author

@rustbot rustbot 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 Jun 26, 2023
@psumbera psumbera mentioned this pull request Jun 27, 2023
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@psumbera psumbera requested a review from onur-ozkan June 27, 2023 12:31
@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 28, 2023

📌 Commit 35cfac1 has been approved by ozkanonur

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 Jun 28, 2023
@TaKO8Ki TaKO8Ki mentioned this pull request Jun 28, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 29, 2023
@bors
Auto merge of rust-lang#113134 - TaKO8Ki:rollup-4hvqzf6, r=TaKO8Ki
de22388 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#112946 (Improve cgu naming and ordering)
 - rust-lang#113048 (Fix build on Solaris where fd-lock cannot be used.)
 - rust-lang#113100 (Fix display of long items in search results)
 - rust-lang#113107 (add check for ConstKind::Value(_) to in_operand())
 - rust-lang#113119 (rustdoc: Reduce internal function visibility.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 376c944 into rust-lang:master Jun 29, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Assignees

@onur-ozkan onur-ozkan

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.72.0
Development

Successfully merging this pull request may close these issues.

error: unused import - when building Rust on Solaris where isn't fd-lock available
5 participants
@psumbera @rustbot @onur-ozkan @rust-log-analyzer @bors