Skip to content

[5.9][Build] Skip early-* on non-darwin hosts #68094

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
Aug 24, 2023
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# ----------------------------------------------------------------------------

import os
import sys

from . import earlyswiftsyntax
from . import product
Expand Down Expand Up @@ -42,6 +43,11 @@ def is_before_build_script_impl_product(cls):
return True

def should_build(self, host_target):
# Temporarily disable for non-darwin since this build never works
# outside of that case currently.
if sys.platform != 'darwin':
return False

if self.is_cross_compile_target(host_target):
return False

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#
# ----------------------------------------------------------------------------

import sys

from . import cmake_product
from .. import toolchain

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

def should_build(self, host_target):
# Temporarily disable for non-darwin since this build never works
# outside of that case currently.
if sys.platform != 'darwin':
return False

if self.args.build_early_swiftsyntax:
if toolchain.host_toolchain().find_tool("swift") is None:
warn_msg = 'Host toolchain could not locate a '\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# RUN: mkdir -p %t
# 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

# REQUIRES: standalone_build
# REQUIRES: standalone_build, OS=macosx

# Just make sure we compute the build graph/emit output.
#
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# REQUIRES: standalone_build
# REQUIRES: standalone_build, OS=macosx

# RUN: %empty-directory(%t)
# RUN: mkdir -p %t
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# REQUIRES: standalone_build
# REQUIRES: standalone_build, OS=macosx

# RUN: %empty-directory(%t)
# RUN: mkdir -p %t
# 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

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