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

Fix the build on FreeBSD. #7376

Merged
merged 1 commit into from Jun 22, 2016
Merged

Fix the build on FreeBSD. #7376

merged 1 commit into from Jun 22, 2016

Conversation

knz
Copy link
Contributor

@knz knz commented Jun 22, 2016

This together with cockroachdb/c-jemalloc#5 and elastic/gosigar#33 produces a working cockroach binary on FreeBSD 10.3-STABLE.


This change is Reviewable

@mberhault
Copy link
Contributor

LGTM. you'll also need to update the c-jemalloc dependency once you've merged it.

@knz
Copy link
Contributor Author

knz commented Jun 22, 2016

Thanks for the hint. Done.

@@ -19,6 +19,7 @@
package status

// #cgo darwin CPPFLAGS: -I../../../c-jemalloc/darwin_includes/internal/include
// #cgo freebsd CPPFLAGS: -I../../../c-jemalloc/freebsd_includes/internal/include
Copy link
Contributor

Choose a reason for hiding this comment

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

this ordering upsets my OCD

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 don't get it: "f" comes after "d" and before "l" in the alphabet, doesn't it?

Copy link
Contributor

Choose a reason for hiding this comment

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

and yet this is not the order you used anywhere else

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is mildly frustrating: if you wanted to communicate that the two files did not use the same ordering, why didn't you write so in the first place? It would have saved us two backs-and-forth. Anyway, it's corrected now.

@knz knz merged commit 0675d16 into cockroachdb:master Jun 22, 2016
@knz knz deleted the fix-freebsd branch June 22, 2016 14:56
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.

None yet

3 participants