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

Fix build on OS X #47

Merged
merged 1 commit into from
Apr 17, 2016
Merged

Fix build on OS X #47

merged 1 commit into from
Apr 17, 2016

Conversation

bgamari
Copy link
Contributor

@bgamari bgamari commented Apr 17, 2016

This was triggered on Darwin.

@bgamari
Copy link
Contributor Author

bgamari commented Apr 17, 2016

IMHO it might be worth using-fno-warn-unused-imports here and dropping the CPP from the import lists; this is currently much more fragile than necessary for relatively little benefit.

@Rufflewind
Copy link
Member

I think it should probably be like this?

(fromMaybe (utcTimeToPOSIXSeconds atimeOld) atime')
(fromMaybe (utcTimeToPOSIXSeconds mtimeOld) mtime')

@bgamari bgamari force-pushed the master branch 5 times, most recently from 574ec2d to 261147f Compare April 17, 2016 13:33
@bgamari
Copy link
Contributor Author

bgamari commented Apr 17, 2016

Yes, I just finished iterating this; it now seems to build. I'll squash the two commits and write a better commit message.

@bgamari
Fix build on Darwin
e16b2c1 
There were a number of issues there, largely due to the fact that this
codepath is CPP-guarded.
@bgamari bgamari changed the title Add missing import of fromMaybe Fix build on OS X Apr 17, 2016
@bgamari
Copy link
Contributor Author

bgamari commented Apr 17, 2016

@Rufflewind how does this look?

@bgamari
Copy link
Contributor Author

bgamari commented Apr 17, 2016

This has been successfully built on Darwin.

@Rufflewind Rufflewind merged commit e16b2c1 into haskell:master Apr 17, 2016
@Rufflewind
Copy link
Member

Thanks. I might consider adding the warning suppression you suggested. Probably also a good idea to set up OS X testing on Travis in the future.

@hvr hvr mentioned this pull request Apr 18, 2016
Closed
@Rufflewind Rufflewind added type: a-bug The described behavior is not working as intended. and removed type: a-bug The described behavior is not working as intended. labels Apr 30, 2016
bgamari pushed a commit to bgamari/directory that referenced this pull request Jul 29, 2016
@ndmitchell
haskell#47, reformat badElements so it's easier to see what they are
63eaad2
bgamari pushed a commit to bgamari/directory that referenced this pull request Jul 29, 2016
@ndmitchell
haskell#47, make isValid detect more invalid characters
dd13bb3
bgamari pushed a commit to bgamari/directory that referenced this pull request Jul 29, 2016
@ndmitchell
haskell#47, isValid now detects invalid files like "nul .txt" on Windows
71f02bc
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.
2 participants
@bgamari @Rufflewind