Skip to content

Commit 1e09ad0

Browse files
authored
Merge pull request swiftlang#33699 from CodaFi/cmake-and-model
2 parents a0cdeb5 + 161fa16 commit 1e09ad0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

utils/swift_build_support/swift_build_support/cmake.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from __future__ import absolute_import, unicode_literals
1919

2020
import os
21+
import platform
2122
import re
2223
from numbers import Number
2324

@@ -255,6 +256,9 @@ def build_cmake(self, source_root, build_root):
255256
# the source and build the source if necessary. Returns the path to the
256257
# cmake binary.
257258
def check_cmake_version(self, source_root, build_root):
259+
if platform.system() != 'Linux':
260+
return
261+
258262
cmake_source_dir = os.path.join(source_root, 'cmake')
259263
# If the source is not checked out then don't attempt to build cmake.
260264
if not os.path.isdir(cmake_source_dir):
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# REQUIRES: standalone_build
22
#
3-
# RUN: %swift_src_root/utils/build-script --dump-config --skip-local-build 2>&1 | %FileCheck %s -check-prefix=CONFIG --dump-input=always
3+
# RUN: %swift_src_root/utils/build-script --dump-config --skip-local-build 2>&1 | %FileCheck %s -check-prefix=CONFIG
44
# CONFIG: "skip_local_build": true
55

6-
# RUN: %swift_src_root/utils/build-script --dry-run --verbose-build --skip-local-build 2>&1 | %FileCheck %s -check-prefix=DRY --dump-input=always
6+
# RUN: %swift_src_root/utils/build-script --dry-run --verbose-build --skip-local-build 2>&1 | %FileCheck %s -check-prefix=DRY
77
# DRY: build-script-impl
88
# DRY-SAME: --skip-local-build

0 commit comments

Comments
 (0)