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

Do not include windows_cconv.h on non mingw32 systems #79

Merged
merged 1 commit into from
Nov 13, 2017

Conversation

iliastsi
Copy link
Contributor

@iliastsi iliastsi commented Nov 8, 2017

Do not include windows_cconv.h on non windows systems, or else build
fails with #error Unknown mingw32 arch on architectures other than
i386 or x86_64.

This causes ThreadScope to fail to build on architectures other than i386 or x86_64.
As an example, see the build logs on arm64.

@Mikolaj
Copy link
Member

Mikolaj commented Nov 10, 2017

Sounds reasonable. I will merge if nobody objects.

GUI/GtkExtras.hs Outdated
#include "windows_cconv.h"
#endif
Copy link
Member

Choose a reason for hiding this comment

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

Can you flip the condition like this? It's easier to read.

#if mingw32_HOST_OS || mingw32_TARGET_OS
#include "windows_cconv.h"
#else
import ...
#endif

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

Do not include windows_cconv.h on non windows systems, or else build
fails with `#error Unknown mingw32 arch` on architectures other than
i386 or x86_64.
@maoe
Copy link
Member

maoe commented Nov 13, 2017

LGTM, thanks!

As for the Travis failures, they seem irrelevant to this PR.

  • cairo is failing to build with GHC 7.6.3
  • hashable is failing to build with GHC 7.8.3
  • homebrew is failing due to old Ruby interpreter

I'll fix above in a separate PR when I have time.

@maoe maoe merged commit 8616527 into haskell:master Nov 13, 2017
@Mikolaj
Copy link
Member

Mikolaj commented Nov 13, 2017

Party!

maoe pushed a commit that referenced this pull request Feb 16, 2018
* Add instructions to install gtk2 in the README
* Do not include windows_cconv.h on non mingw32 systems (#79)
* Relax upper version bound for ghc-events (#80)
* Relax upper version bound for time
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