From 00a9bf3e4a0ca1ba10985a82a04164bd824fdfb6 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Wed, 1 Nov 2023 07:27:01 +0530 Subject: [PATCH] [Build] Enable building the early Swift Driver on linux with the prebuilt host toolchain --- .../swift_build_support/products/earlyswiftdriver.py | 6 ------ .../BuildSystem/infer_dumps_deps_if_verbose_build.test | 2 +- .../BuildSystem/test_early_swift_driver_and_infer.swift | 2 +- .../BuildSystem/test_early_swift_driver_and_test.test | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py b/utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py index 62c5222a54bf3..46b64231b63d6 100644 --- a/utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py +++ b/utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py @@ -11,7 +11,6 @@ # ---------------------------------------------------------------------------- import os -import sys from . import product from .. import shell @@ -42,11 +41,6 @@ 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 diff --git a/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test b/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test index 3896eb683393b..5cfe414ef81b8 100644 --- a/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test +++ b/validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test @@ -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, OS=macosx +# REQUIRES: standalone_build # Just make sure we compute the build graph/emit output. # diff --git a/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift b/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift index 8a788281adaf9..ec3190613e681 100644 --- a/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift +++ b/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift @@ -1,4 +1,4 @@ -# REQUIRES: standalone_build, OS=macosx +# REQUIRES: standalone_build # RUN: %empty-directory(%t) # RUN: mkdir -p %t diff --git a/validation-test/BuildSystem/test_early_swift_driver_and_test.test b/validation-test/BuildSystem/test_early_swift_driver_and_test.test index b2eb4bc89e962..4e9e8b12e7f91 100644 --- a/validation-test/BuildSystem/test_early_swift_driver_and_test.test +++ b/validation-test/BuildSystem/test_early_swift_driver_and_test.test @@ -1,4 +1,4 @@ -# REQUIRES: standalone_build, OS=macosx +# REQUIRES: standalone_build # RUN: %empty-directory(%t) # RUN: mkdir -p %t