Skip to content

Fix build-script always building Ninja from source #11919

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

Merged
merged 1 commit into from
Sep 14, 2017

Conversation

Rostepher
Copy link
Contributor

Purpose

This PR fixes a small issue introduced in #11882 that causes build-script to always build Ninja from source if the cmake generator is set to Ninja.

rdar://34425220

… real logic for decided when to use the system ninja or to build it from source.
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@slavapestov
Copy link
Contributor

Thanks!

@davezarzycki
Copy link
Contributor

Thanks for the quick fix @Rostepher! :-)

@davezarzycki
Copy link
Contributor

I've verified that this fixes the regression on my machine. Thanks again

@Rostepher Rostepher merged commit 6d16044 into swiftlang:master Sep 14, 2017
@Rostepher Rostepher deleted the fix-build-ninja branch February 4, 2018 00:41
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.

3 participants