Skip to content

Commit 2d28001

Browse files
committed
Remove swift-foundation-icu from build script
1 parent 3136f03 commit 2d28001

File tree

2 files changed

+1
-78
lines changed

2 files changed

+1
-78
lines changed

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -634,13 +634,6 @@ def compute_product_pipelines(self):
634634
builder.add_impl_product(products.LibDispatch,
635635
is_enabled=self.args.build_libdispatch)
636636

637-
# Begin a pipeline to build Foundation's dependencies now that Swift
638-
# has built. This needs to be done before Foundation can build
639-
builder.begin_pipeline()
640-
641-
builder.add_product(products.foundation.SwiftFoundationICU,
642-
is_enabled=self.args.build_foundation)
643-
644637
# Begin a new build-script-impl pipeline that builds libraries that we
645638
# build as part of build-script-impl but that we should eventually move
646639
# onto build-script products.

utils/swift_build_support/swift_build_support/products/foundation.py

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13-
from . import cmake_product
1413
from . import cmark
1514
from . import curl
1615
from . import libcxx
@@ -22,74 +21,6 @@
2221
from . import swift
2322
from . import zlib
2423

25-
class SwiftFoundationICU(cmake_product.CMakeProduct):
26-
@classmethod
27-
def is_build_script_impl_product(cls):
28-
"""is_build_script_impl_product -> bool
29-
30-
Whether this product is produced by build-script-impl.
31-
"""
32-
return False
33-
34-
@classmethod
35-
def is_before_build_script_impl_product(cls):
36-
"""is_before_build_script_impl_product -> bool
37-
38-
Whether this product is built before any build-script-impl products.
39-
"""
40-
return True
41-
42-
@classmethod
43-
def product_source_name(cls):
44-
"""product_source_name() -> str
45-
46-
The name of the source code directory of this product.
47-
"""
48-
return "swift-foundation-icu"
49-
50-
@classmethod
51-
def get_dependencies(cls):
52-
return [swift.Swift]
53-
54-
@classmethod
55-
def is_nondarwin_only_build_product(cls):
56-
return True
57-
58-
def should_build(self, host_target):
59-
"""should_build() -> Bool
60-
61-
Whether or not this product should be built with the given arguments.
62-
"""
63-
return self.args.build_foundation
64-
65-
def build(self, host_target):
66-
"""build() -> void
67-
68-
Perform the build, for a non-build-script-impl product.
69-
"""
70-
self.build_with_cmake(['FoundationICU'], self.args.foundation_build_variant, [], True)
71-
72-
def should_test(self, host_target):
73-
"""should_test() -> Bool
74-
75-
Whether or not this product should be tested with the given arguments.
76-
"""
77-
return False
78-
79-
def should_install(self, host_target):
80-
"""should_install() -> Bool
81-
82-
Whether or not this product should be installed with the given
83-
arguments.
84-
"""
85-
return self.args.build_foundation
86-
87-
def install(self, host_target):
88-
"""install() -> void
89-
90-
Install to the toolchain, for a non-build-script-impl product.
91-
"""
92-
self.install_with_cmake(['install'], self.host_install_destdir(host_target))
9324

9425
class Foundation(product.Product):
9526
@classmethod
@@ -126,8 +57,7 @@ def get_dependencies(cls):
12657
libdispatch.LibDispatch,
12758
libxml2.LibXML2,
12859
zlib.Zlib,
129-
curl.LibCurl,
130-
SwiftFoundationICU]
60+
curl.LibCurl]
13161

13262
@classmethod
13363
def is_nondarwin_only_build_product(cls):

0 commit comments

Comments
 (0)