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

Guard explicit instantiation for OSX builds #38433

Merged
merged 1 commit into from
Feb 28, 2020

Conversation

ZhilkinSerg
Copy link
Contributor

Summary

SUMMARY: None

Purpose of change

Possibly fix OSX cross compile issue which appeared after #38361.

Describe the solution

Guard explicit instantiation for OSX builds

Testing

Try cross-compiling to OSX.

@ZhilkinSerg ZhilkinSerg added Code: Build Issues regarding different builds and build environments OS: macOS Issues related to macOS / OSX operating system labels Feb 28, 2020
@ZhilkinSerg
Copy link
Contributor Author

It is a bit of a hack, but it would hopefully restore OSX (and dependent Android) builds on Jenkins.

@ZhilkinSerg
Copy link
Contributor Author

I will self-compile it to test on Jenkins.

@ZhilkinSerg ZhilkinSerg merged commit e995a6e into CleverRaven:master Feb 28, 2020
@kevingranade
Copy link
Member

This issue has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/compiling-error/22951/3

@ZhilkinSerg ZhilkinSerg deleted the build-osx-conditionals branch March 31, 2020 19:57
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: macOS Issues related to macOS / OSX operating system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants