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

valgrind: fix build on darwin #52540

Merged
merged 1 commit into from Dec 19, 2018
Merged

Conversation

hedning
Copy link
Contributor

@hedning hedning commented Dec 19, 2018

Motivation for this change

cherry pick of #52014 (comment) to master

cc @matthewbauer

(hopefully did this correctly, not really keen on pushing directly to master).

closes #52232

We fixed a race condition in NixOS#51505 and NixOS#51107. This required running
autoreconfHook to pick up the `coregrind-makefile-race.patch` patch.

Unfortunately this broke darwin's postPatch fixes as autoreconfHook would run
afterwards regenerating the fixed makefiles.

Moving the postPatch fixes to preConfigure should resolve the issue.

I left `postPatch = ""` in to avoid a rebuild on linux.

(cherry picked from commit a6d4a0c)
@matthewbauer
Copy link
Member

Thanks! While the rebuild count looks bad, all of those that are rebuilt are failing already... no harm should be done.

@matthewbauer matthewbauer merged commit a16a9fc into NixOS:master Dec 19, 2018
@hedning hedning deleted the cherry-pick-valgrind branch December 19, 2018 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

valgrind is broken on darwin (fix is in staging)
3 participants