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

bootstrap: Add openssl configuration for sparc64-unknown-linux-gnu #45465

Merged
merged 1 commit into from
Oct 25, 2017
Merged

bootstrap: Add openssl configuration for sparc64-unknown-linux-gnu #45465

merged 1 commit into from
Oct 25, 2017

Conversation

glaubitz
Copy link
Contributor

Hi!

This adds the target missing mapping for sparc64-unknown-linux-gnu.

See: #45456

Thanks

@rust-highfive
Copy link
Collaborator

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 23, 2017
@Mark-Simulacrum
Copy link
Member

r? @alexcrichton

jrtc27
jrtc27 suggested changes Oct 23, 2017
View reviewed changes
src/bootstrap/native.rs Outdated
@@ -446,6 +446,7 @@ impl Step for Openssl {
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
"s390x-unknown-linux-gnu" => "linux64-s390x",
"sparc64-unknown-linux-gnu" => "linux-sparc64",
Copy link

Choose a reason for hiding this comment

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

I believe it's actually linux64-sparcv9: https://github.com/libtor/openssl/blob/1ad38e5/Configure#L385

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, good catch, thank you. I was actually unsure about this but my tests aren't finished yet.

Will get back in a few minutes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have changed that now. I'm now testing whether we need to pass "-m64" as well (see the case for BSD-sparc64 further below).

Copy link

Choose a reason for hiding this comment

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

No, OpenSSL puts -m64 in there already for linux64-sparcv9.

@alexcrichton
Copy link
Member

@bors: r+ rollup

Thanks!

@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Oct 23, 2017

📌 Commit e105697 has been approved by alexcrichton

@glaubitz
Copy link
Contributor Author

@alexcrichton I think you picked the wrong commit. My first mapping was incorrect.

Could you please make sure you are merging b9f2cfb?

Thanks

@kennytm
Copy link
Member

kennytm commented Oct 24, 2017

@bors r=alexcrichton b9f2cfb

@bors
Copy link
Contributor

bors commented Oct 24, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Oct 24, 2017

🙀 b9f2cfb is not a valid commit SHA. Please try again with e105697.

@kennytm
Copy link
Member

kennytm commented Oct 24, 2017 •
edited
Loading

@glaubitz Perhaps try to amend and force-push a new commit. Bors is not recognizing the new commit.

@bors r-

@kennytm kennytm 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 Oct 24, 2017
@glaubitz
Copy link
Contributor Author

@kennytm Thanks. I have rebased and pushed 929a8bc.

@kennytm
Copy link
Member

kennytm commented Oct 24, 2017

@bors r=alexcrichton 929a8bc

@kennytm kennytm 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 Oct 24, 2017
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Oct 25, 2017
@GuillaumeGomez
Rollup merge of rust-lang#45465 - glaubitz:sparc64, r=alexcrichton
e09585c 
bootstrap: Add openssl configuration for sparc64-unknown-linux-gnu

Hi!

This adds the target missing mapping for sparc64-unknown-linux-gnu.

See: rust-lang#45456

Thanks
@GuillaumeGomez GuillaumeGomez mentioned this pull request Oct 25, 2017
Merged
bors added a commit that referenced this pull request Oct 25, 2017
@bors
Auto merge of #45513 - GuillaumeGomez:rollup, r=GuillaumeGomez
2f5ae25 
Rollup of 5 pull requests

- Successful merges: #45361, #45461, #45465, #45486, #45502
- Failed merges:
@bors bors merged commit 929a8bc into rust-lang:master Oct 25, 2017
@glaubitz glaubitz mentioned this pull request Oct 25, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jrtc27 jrtc27 jrtc27 requested changes

Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@glaubitz @rust-highfive @Mark-Simulacrum @alexcrichton @bors @kennytm @jrtc27 @aturon