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 cross-compiling for OSX #34572

Merged
merged 1 commit into from
Oct 9, 2019
Merged

Fix cross-compiling for OSX #34572

merged 1 commit into from
Oct 9, 2019

Conversation

ZhilkinSerg
Copy link
Contributor

Summary

SUMMARY: None

Purpose of change

Small follow-up after #34549 to restore failing builds on Jenkins.

Describe the solution

Guard some config search code in Makefile when cross-compiling for OSX.

Additional context

See https://ci.narc.ro/job/Cataclysm-Matrix/9729/Graphics=Curses,Platform=OSX/consoleFull for failing build log.

@ZhilkinSerg ZhilkinSerg added Code: Build Issues regarding different builds and build environments OS: macOS Issues related to macOS / OSX operating system OS: Linux Issues related to Linux operating system labels Oct 8, 2019
@ZhilkinSerg ZhilkinSerg merged commit bc7e9e6 into master Oct 9, 2019
@ZhilkinSerg ZhilkinSerg deleted the makefile-osxcross-ncurses branch October 15, 2019 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code: Build Issues regarding different builds and build environments OS: Linux Issues related to Linux operating system OS: macOS Issues related to macOS / OSX operating system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant