Skip to content

Commit a03f6e5

Browse files
committed
[Build] Enable building and CI testing the early Swift Driver on linux with the prebuilt host toolchain
1 parent 36a15ce commit a03f6e5

File tree

5 files changed

+6
-12
lines changed

5 files changed

+6
-12
lines changed

test/Driver/Dependencies/only-skip-once.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// XFAIL: OS=linux-gnu, OS=openbsd, OS=windows-msvc, OS=linux-android, OS=linux-androideabi
1+
// XFAIL: OS=openbsd, OS=windows-msvc
22

33
// RUN: %empty-directory(%t)
44
// RUN: cp -r %S/Inputs/only-skip-once/* %t
@@ -9,7 +9,7 @@
99
// CHECK-INITIAL: {{(Job finished: {compile: main.o <= main.swift}|Finished Compiling main.swift)}}
1010
// CHECK-INITIAL: {{(Job finished: {compile: file1.o <= file1.swift}|Finished Compiling file1.swift)}}
1111
// CHECK-INITIAL: {{(Job finished: {compile: file2.o <= file2.swift}|Finished Compiling file2.swift)}}
12-
// CHECK-INITIAL: {{(Job finished: {link: main <= main.o file1.o file2.o}|Finished Linking main)}}
12+
// CHECK-INITIAL: {{(Job finished: {link: main <= main.o file1.o file2.o|Finished Linking main)}}
1313

1414
// RUN: touch -t 201401240006 %t/file2.swift
1515
// RUN: cd %t && %target-swiftc_driver -driver-show-job-lifecycle -output-file-map %t/output-file-map.json -incremental main.swift file1.swift file2.swift -j1 2>&1 | %FileCheck -check-prefix=CHECK-REBUILD %s
@@ -18,5 +18,5 @@
1818
// CHECK-REBUILD-DAG: {{(Job finished: {compile: file2.o <= file2.swift}|Finished Compiling file2.swift)}}
1919
// CHECK-REBUILD-DAG: {{(Job skipped: {compile: main.o <= main.swift}|Skipped Compiling main.swift)}}
2020
// CHECK-REBUILD-DAG: {{(Job skipped: {compile: file1.o <= file1.swift}|Skipped Compiling file1.swift)}}
21-
// CHECK-REBUILD-DAG: {{(Job finished: {link: main <= main.o file1.o file2.o}|Finished Linking main)}}
21+
// CHECK-REBUILD-DAG: {{(Job finished: {link: main <= main.o file1.o file2.o|Finished Linking main)}}
2222
// CHECK-REBUILD-NOT: {{(Job skipped:|Skipped)}}

utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py

-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
# ----------------------------------------------------------------------------
1212

1313
import os
14-
import sys
1514

1615
from . import product
1716
from .. import shell
@@ -42,11 +41,6 @@ def is_before_build_script_impl_product(cls):
4241
return True
4342

4443
def should_build(self, host_target):
45-
# Temporarily disable for non-darwin since this build never works
46-
# outside of that case currently.
47-
if sys.platform != 'darwin':
48-
return False
49-
5044
if self.is_cross_compile_target(host_target):
5145
return False
5246

validation-test/BuildSystem/infer_dumps_deps_if_verbose_build.test

+1-1
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, OS=macosx
5+
# REQUIRES: standalone_build
66

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

validation-test/BuildSystem/test_early_swift_driver_and_infer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: standalone_build, OS=macosx
1+
# REQUIRES: standalone_build
22

33
# RUN: %empty-directory(%t)
44
# RUN: mkdir -p %t

validation-test/BuildSystem/test_early_swift_driver_and_test.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# REQUIRES: standalone_build, OS=macosx
1+
# REQUIRES: standalone_build
22

33
# RUN: %empty-directory(%t)
44
# RUN: mkdir -p %t

0 commit comments

Comments
 (0)