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 failures on MacOS #617

Merged
merged 2 commits into from Feb 21, 2018
Merged

Fix failures on MacOS #617

merged 2 commits into from Feb 21, 2018

Conversation

larskanis
Copy link
Member

Fix failures on MacOS intruduced by #540.

See the commit messages for detailed descriptions.

We need ffi_closure_alloc() since commit cf10854 but
don't use ffi_prep_closure() any longer.
When have_header('ffi.h') was successful the system libffi include
path is added to INCFLAGS. But when have_func() fails later on
the bundled libffi which should be used instead.

Using the wrong ffi.h resulted in compiler warnings about undefined
functions and leaded to segfaults on MacOS.
@larskanis
Copy link
Member Author

@tduehr Thank you for reviewing! IMHO it would be better to use a merge commit instead of squashing the commits the next time. It otherwise breaks the relation between the commit message and the source changes. If the commits belong semantically together, I do the squashing before PR'ing. Thank you!

@tduehr
Copy link
Member

tduehr commented Feb 21, 2018

Makes sense, will do from here out. I normally squash stuff cause I'm a sucker for a linear, concise history.

@larskanis
Copy link
Member Author

Ok, good to know. In contrast, having been forced to linear history by CVS and SVN until 10 years ago, I really enjoy the offline, octopus merge and rebase capabilities of git.

@tduehr
Copy link
Member

tduehr commented Feb 22, 2018

I know a couple devs that manufacture a nonlinear history. Drives me crazy. My own repos normally have fluid histories near HEAD. I’m working on a PR I must have rebased my own history 20 times by now. Otherwise, my histories look like Charlie Brown’s xmas tree without the bend.

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

2 participants