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: unbreak building with ICU on macOS #8186

Merged
merged 1 commit into from Jun 5, 2020
Merged

Conversation

danchr
Copy link
Contributor

@danchr danchr commented Jun 5, 2020

A symbol clash breaks building ICU on macOS, and although it isn't necessary, it might as well be possible.

@MarcusCalhoun-Lopez originally wrote the patch for MacPorts, so I've attributed authorship to him.

A symbol clash breaks building ICU on macOS, and although it isn't
necessary, it might as well be possible.
LordAro
LordAro previously approved these changes Jun 5, 2020
@andythenorth
Copy link
Contributor

Thanks!

@LordAro
Copy link
Member

LordAro commented Jun 5, 2020

Just to convince the CI that the change is good, can you rebase it?

@LordAro LordAro merged commit eeed3a7 into OpenTTD:master Jun 5, 2020
@danchr danchr deleted the icu-on-mac branch June 5, 2020 13:48
@LordAro LordAro added the backport requested This PR should be backport to current release (RC / stable) label Jul 27, 2020
@glx22 glx22 added backported This PR is backported to a current release (RC / stable) and removed backport requested This PR should be backport to current release (RC / stable) labels Nov 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backported This PR is backported to a current release (RC / stable)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants