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

Support Bitrig #607

Merged
merged 5 commits into from
Jul 1, 2013
Merged

Support Bitrig #607

merged 5 commits into from
Jul 1, 2013

Conversation

dajohi
Copy link
Contributor

@dajohi dajohi commented Jun 29, 2013

This adds support for Bitrig, an OpenBSD fork.

@buildhive
Copy link

Evan Martin » ninja #516 SUCCESS
This pull request looks good
(what's this?)

@buildhive
Copy link

Evan Martin » ninja #517 FAILURE
Looks like there's a problem with this pull request
(what's this?)

@buildhive
Copy link

Evan Martin » ninja #518 SUCCESS
This pull request looks good
(what's this?)

nico
nico reviewed Jun 30, 2013
View reviewed changes
src/subprocess_test.cc
@@ -152,7 +152,7 @@ struct SubprocessTest : public testing::Test {

// OS X's process limit is less than 1025 by default
// (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that).
#if defined(linux) || defined(__OpenBSD__)
#if !defined(__APPLE__)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Does this test work on Windows?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

anyone able to test?

@buildhive
Copy link

Evan Martin » ninja #523 SUCCESS
This pull request looks good
(what's this?)

nico
nico reviewed Jul 1, 2013
View reviewed changes
src/subprocess-posix.cc
@@ -224,7 +224,7 @@ bool SubprocessSet::DoWork() {
return interrupted_;
}

#else // linux || __OpenBSD__
#else // linux || __OpenBSD__ || __Bitrig__
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should probably be // !defined(USE_PPOLL)

@buildhive
Copy link

Evan Martin » ninja #524 SUCCESS
This pull request looks good
(what's this?)

nico added a commit that referenced this pull request Jul 1, 2013
@nico
Merge pull request #607 from dajohi/master
da06d29 
Support Bitrig
@nico nico merged commit da06d29 into ninja-build:master Jul 1, 2013
@nico
Copy link
Collaborator

nico commented Jul 1, 2013

That looks good, thanks.

If bitrig is an OpenBSD fork, I wonder if bitrig wouldn't have less work if they defined __OpenBSD__ and generally claimed to be OpenBSD (and likewise, configure.py could return is_openbsd() for bitrig). Not our choice to make, though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dajohi @buildhive @nico