Skip to content

Commit 106d2df

Browse files
authored
Merge pull request #68094 from bnbarham/disable-early-linux-59
[5.9][Build] Skip early-* on non-darwin hosts
2 parents ddf6cf9 + 64e2b19 commit 106d2df

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# ----------------------------------------------------------------------------
1212

1313
import os
14+
import sys
1415

1516
from . import earlyswiftsyntax
1617
from . import product
@@ -42,6 +43,11 @@ def is_before_build_script_impl_product(cls):
4243
return True
4344

4445
def should_build(self, host_target):
46+
# Temporarily disable for non-darwin since this build never works
47+
# outside of that case currently.
48+
if sys.platform != 'darwin':
49+
return False
50+
4551
if self.is_cross_compile_target(host_target):
4652
return False
4753

utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
import sys
14+
1315
from . import cmake_product
1416
from .. import toolchain
1517

@@ -32,6 +34,11 @@ def is_before_build_script_impl_product(cls):
3234
return True
3335

3436
def should_build(self, host_target):
37+
# Temporarily disable for non-darwin since this build never works
38+
# outside of that case currently.
39+
if sys.platform != 'darwin':
40+
return False
41+
3542
if self.args.build_early_swiftsyntax:
3643
if toolchain.host_toolchain().find_tool("swift") is None:
3744
warn_msg = 'Host toolchain could not locate a '\

validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# RUN: mkdir -p %t
33
# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --verbose-build --dry-run --infer --swiftpm --cmake %cmake 2>&1 | %FileCheck %s
44

5-
# REQUIRES: standalone_build
5+
# REQUIRES: standalone_build, OS=macosx
66

77
# Just make sure we compute the build graph/emit output.
88
#

validation-test/BuildSystem/test_early_swift_driver_and_infer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: standalone_build
1+
# REQUIRES: standalone_build, OS=macosx
22

33
# RUN: %empty-directory(%t)
44
# RUN: mkdir -p %t
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# REQUIRES: standalone_build
1+
# REQUIRES: standalone_build, OS=macosx
22

33
# RUN: %empty-directory(%t)
44
# RUN: mkdir -p %t
55
# RUN: SKIP_XCODE_VERSION_CHECK=1 SWIFT_BUILD_ROOT=%t %swift_src_root/utils/build-script --dry-run --test --cmake %cmake 2>&1 | %FileCheck %s
66

77
# CHECK: --- Building earlyswiftdriver ---
8-
# CHECK: cmake --build {{.*}}check-swift-only_early_swiftdriver
8+
# CHECK: cmake --build {{.*}}check-swift-only_early_swiftdriver

0 commit comments

Comments
 (0)