Skip to content

swift_build_support cmake.py: allow bootstrapping CMake on FreeBSD #66652

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
Jun 15, 2023
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions utils/swift_build_support/swift_build_support/cmake.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,11 @@ def build_cmake(self, source_root, build_root):
os.chdir(cwd)
return os.path.join(cmake_build_dir, 'bin', 'cmake')

# For Linux only, determine the version of the installed CMake compared to
# the source and build the source if necessary. Returns the path to the
# cmake binary.
# For Linux and FreeBSD only, determine the version of the installed
# CMake compared to 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':
if not platform.system() in ["Linux", "FreeBSD"]:
return

cmake_source_dir = os.path.join(source_root, 'cmake')
Expand Down