Skip to content

OpenBSD don't support morestack#26213

Merged
bors merged 1 commit into
rust-lang:masterfrom
semarie:openbsd-morestack
Jun 14, 2015
Merged

OpenBSD don't support morestack#26213
bors merged 1 commit into
rust-lang:masterfrom
semarie:openbsd-morestack

Conversation

@semarie

@semarie semarie commented Jun 11, 2015

Copy link
Copy Markdown
Contributor

don't try to bind __morestack symbol under OpenBSD as the platform don't
have morestack support.

r? @alexcrichton

it unbreak build under OpenBSD. Does some others platforms don't have morestack too ? They should be impacted by this problem too.

@semarie

semarie commented Jun 11, 2015 via email

Copy link
Copy Markdown
Contributor Author

@bors

bors commented Jun 11, 2015

Copy link
Copy Markdown
Collaborator

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

@semarie semarie force-pushed the openbsd-morestack branch from 815f322 to 85b7164 Compare June 11, 2015 16:55
@semarie

semarie commented Jun 11, 2015

Copy link
Copy Markdown
Contributor Author

PR rebased

@alexcrichton

Copy link
Copy Markdown
Member

This.. may be getting a bit out of hand with a long list of platforms, can this perhaps only be enabled on windows/mac/linux?

cc @nrc and #25627

@semarie

semarie commented Jun 13, 2015

Copy link
Copy Markdown
Contributor Author

ping ? I would unbreak openbsd build.

I could amend the patch for match only mac/linux (if someone tell me accurate variables to check). For windows, I don't think it should be included, as it is part of the current list of platforms that shouldn't have the snippet included.

Does these variables should be ok ?

  • defined(__linux__)
  • defined(__APPLE__)

@alexcrichton

Copy link
Copy Markdown
Member

Yeah I think checking those variables should be fine.

instead of enumerate the (long) list of platforms to exclude, use only
the short list of platforms to include.

should fixes __morestack symbol problem under openbsd
@semarie semarie force-pushed the openbsd-morestack branch from 85b7164 to b804c24 Compare June 14, 2015 07:00
@semarie

semarie commented Jun 14, 2015

Copy link
Copy Markdown
Contributor Author

@alexcrichton I have inversed the logic: code included only for linux and APPLE

@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ b804c24

bors added a commit that referenced this pull request Jun 14, 2015
don't try to bind __morestack symbol under OpenBSD as the platform don't
have morestack support.

r? @alexcrichton 

it unbreak build under OpenBSD. Does some others platforms don't have morestack too ? They should be impacted by this problem too.
@bors

bors commented Jun 14, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b804c24 with merge b26eeff...

@bors

bors commented Jun 14, 2015

Copy link
Copy Markdown
Collaborator

@bors bors merged commit b804c24 into rust-lang:master Jun 14, 2015
@dhuseby

dhuseby commented Jun 16, 2015

Copy link
Copy Markdown

@semarie I'm so sorry about that...I don't know why I forgot to add it.

@semarie semarie deleted the openbsd-morestack branch June 17, 2015 09:45
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.

4 participants