Skip to content

sys: termios: Fix inverted logic for [cfg()] conditional for sparc64 #1151

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.

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

Merged
merged 2 commits into from
Nov 3, 2019

Conversation

glaubitz
Copy link
Contributor

@glaubitz glaubitz commented Nov 1, 2019

The fix for #1149 has the logic for the [cfg()] conditional inverted
so that the aliases for VMIN and VTIME are defined on targets that
are not linux-sparc64.

The fix for nix-rust#1149 has the logic for the [cfg()] conditional inverted
so that the aliases for VMIN and VTIME are defined on targets that
are not linux-sparc64.
@glaubitz
Copy link
Contributor Author

glaubitz commented Nov 1, 2019

Before merging this, please let me have another test run. I need to verify again that the fix works properly.

@glaubitz
Copy link
Contributor Author

glaubitz commented Nov 1, 2019

Okay, this works now and rustyline builds fine on sparc64.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

bors bot added a commit that referenced this pull request Nov 2, 2019
1151: sys: termios: Fix inverted logic for [cfg()] conditional for sparc64 r=asomers a=glaubitz

The fix for #1149 has the logic for the [cfg()] conditional inverted
so that the aliases for VMIN and VTIME are defined on targets that
are not linux-sparc64.

Co-authored-by: John Paul Adrian Glaubitz <[email protected]>
@bors
Copy link
Contributor

bors bot commented Nov 2, 2019

Build failed

@asomers
Copy link
Member

asomers commented Nov 2, 2019

You need to rebase to fix the build failure on nightly.

@glaubitz
Copy link
Contributor Author

glaubitz commented Nov 2, 2019

Thanks. I have done that now. Also, simplified the code a bit more.

Copy link
Member

@asomers asomers left a comment

Choose a reason for hiding this comment

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

bors r+

bors bot added a commit that referenced this pull request Nov 2, 2019
1151: sys: termios: Fix inverted logic for [cfg()] conditional for sparc64 r=asomers a=glaubitz

The fix for #1149 has the logic for the [cfg()] conditional inverted
so that the aliases for VMIN and VTIME are defined on targets that
are not linux-sparc64.

Co-authored-by: John Paul Adrian Glaubitz <[email protected]>
@bors
Copy link
Contributor

bors bot commented Nov 3, 2019

Build succeeded

@bors bors bot merged commit c7c1beb into nix-rust:master Nov 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants