Skip to content

Fallback to building Cmake from source on all platforms, not just Linux #33543

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.

Sign up for GitHub

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 2 commits into from
Aug 28, 2020
Merged

Fallback to building Cmake from source on all platforms, not just Linux #33543

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3dcb39
Fallback to building Cmake from source on all platforms, not just Linux
tbkka Aug 18, 2020
b31d027
Remove no-longer-used import
tbkka Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions utils/swift_build_support/swift_build_support/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from __future__ import absolute_import, unicode_literals

import os
import platform
import re
from numbers import Number

Expand Down Expand Up @@ -256,9 +255,6 @@ def build_cmake(self, source_root, build_root):
# the source and build the source if necessary. Returns the path to the
# cmake binary.
def check_cmake_version(self, source_root, build_root):
if platform.system() != 'Linux':
return

cmake_source_dir = os.path.join(source_root, 'cmake')
# If the source is not checked out then don't attempt to build cmake.
if not os.path.isdir(cmake_source_dir):
Expand Down