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.

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

unbreak openbsd after #1217 #1241

Merged
merged 1 commit into from
Feb 9, 2019
Merged

Conversation

semarie
Copy link
Contributor

@semarie semarie commented Feb 6, 2019

No description provided.

@rust-highfive
Copy link

r? @alexcrichton

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

@semarie semarie force-pushed the openbsd-rfc2235 branch 2 times, most recently from d0b0ebc to b18813f Compare February 6, 2019 11:05
@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 6, 2019

How are you testing openbsd ? Rustup does not appear to ship libcore for i686-unknown-openbsd nor x86_64-unknown-openbsd.

@semarie
Copy link
Contributor Author

semarie commented Feb 6, 2019

I ran rustc natively on OpenBSD -current (upcoming 6.5). here, test was done using stable (1.32.0).

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 6, 2019

Could you test if #1233 also solves that ?

@semarie
Copy link
Contributor Author

semarie commented Feb 6, 2019

@gnzlbg ci/run.sh terminate with success, but I am unsure to understand all the details: in order to make my PR to pass tests I needed to manually implement all traits of rfc2235 for several structs (union, or containing big static array as struct member like [::c_char; 256]), and I don't see them in your PR.

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 6, 2019

That's because my PR handwaves that by using #[allow(missing_debug_implementations)]. The extra_traits PR broke pretty much most libc targets, and we did not realize cause we weren't testing them.

@bors
Copy link
Contributor

bors commented Feb 8, 2019

☔ The latest upstream changes (presumably #1247) made this pull request unmergeable. Please resolve the merge conflicts.

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 8, 2019

@semarie it would be great if you could rebase on top of master and test that the build on OpenBSD still works. You might also want to try to see if more cross-compiling OpenBSD targets could be shipped with rustup for linux (or if there are already some more available), and add them to the ci/build.sh script to at least ensure that libc contains no compilation errors for OpenBSD targets.

@semarie
Copy link
Contributor Author

semarie commented Feb 9, 2019

@gnzlbg OpenBSD has no support at all in rustup. Last time I looked at it it was required to me to do all the work to provide a working bootstrap environment for OpenBSD on Linux (which I don't use). At this time, it was a very difficult task as previous OpenBSD versions used hightly customized linker (aka ld) which didn't compile under Linux. The current situation should be better now as we use ld.lld (but I didn't check if all patches are upstreamed or not).

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 9, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 9, 2019

📌 Commit c408759 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Feb 9, 2019

⌛ Testing commit c408759 with merge cb83434...

bors added a commit that referenced this pull request Feb 9, 2019
@bors
Copy link
Contributor

bors commented Feb 9, 2019

💔 Test failed - checks-travis

@gnzlbg
Copy link
Contributor

gnzlbg commented Feb 9, 2019

@bors: retry

@bors
Copy link
Contributor

bors commented Feb 9, 2019

⌛ Testing commit c408759 with merge 34f1c30...

bors added a commit that referenced this pull request Feb 9, 2019
@bors
Copy link
Contributor

bors commented Feb 9, 2019

☀️ Test successful - checks-cirrus, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 34f1c30 to master...

@bors bors merged commit c408759 into rust-lang:master Feb 9, 2019
@semarie semarie deleted the openbsd-rfc2235 branch February 14, 2019 07:47
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.

5 participants