@@ -80,7 +80,6 @@ class PackageSwiftSDKAction(Action):
80
80
def __init__ (
81
81
self , options , snapshot_info : SnapshotInfo ,
82
82
base_toolchain_path : str ,
83
- host_toolchain_path : Optional [str ],
84
83
target_toolchain_path : str ,
85
84
wasi_sysroot_path : str ,
86
85
swift_sdk_name : str ,
@@ -89,7 +88,6 @@ class PackageSwiftSDKAction(Action):
89
88
super ().__init__ (options )
90
89
self .snapshot_info = snapshot_info
91
90
self .base_toolchain_path = base_toolchain_path
92
- self .host_toolchain_path = host_toolchain_path
93
91
self .target_toolchain_path = target_toolchain_path
94
92
self .wasi_sysroot_path = wasi_sysroot_path
95
93
self .swift_sdk_name = swift_sdk_name
@@ -101,7 +99,6 @@ class PackageSwiftSDKAction(Action):
101
99
copy_libxml2_libs (build_sdk_path , self .target_toolchain_path , self .target_triple )
102
100
self .make_swift_sdk (
103
101
self .base_toolchain_path ,
104
- self .host_toolchain_path ,
105
102
self .target_toolchain_path ,
106
103
self .wasi_sysroot_path ,
107
104
self .swift_sdk_name ,
@@ -111,7 +108,6 @@ class PackageSwiftSDKAction(Action):
111
108
def make_swift_sdk (
112
109
self ,
113
110
base_toolchain_path : str ,
114
- host_toolchain_path : Optional [str ],
115
111
target_toolchain_path : str ,
116
112
wasi_sysroot_path : str ,
117
113
swift_sdk_name : str ,
@@ -122,9 +118,6 @@ class PackageSwiftSDKAction(Action):
122
118
123
119
:param base_toolchain_path: The path to the base toolchain, which
124
120
is an upstream toolchain downloaded from swift.org/download.
125
- :param host_toolchain_path: The path to the host toolchain, which
126
- is a toolchain built by ourselves if we need any patches against
127
- the compiler, or just a copy of the base toolchain.
128
121
:param target_toolchain_path: The path to the target toolchain, which
129
122
contains the cross-compiled Swift standard library and SDK for
130
123
WebAssembly.
@@ -142,11 +135,6 @@ class PackageSwiftSDKAction(Action):
142
135
"--swift-version" , self .snapshot_info .swift_version ,
143
136
"--sdk-name" , swift_sdk_name ,
144
137
]
145
- if host_toolchain_path :
146
- sdk_generator_args += [
147
- "--host-swift-package-path" , host_toolchain_path ,
148
- "--host" , self .get_default_target_triple (base_toolchain_path ),
149
- ]
150
138
print ("=====> Building Swift SDK" )
151
139
print (" " .join (sdk_generator_args ))
152
140
self .system (* sdk_generator_args )
@@ -294,7 +282,6 @@ def main():
294
282
actions .append (PackageSwiftSDKAction (
295
283
options , snapshot_info ,
296
284
base_toolchain_path = os .path .join (packaging_dir , 'base-snapshot' ),
297
- host_toolchain_path = None ,
298
285
target_toolchain_path = os .path .join (packaging_dir , 'target-toolchain' , target_triple ),
299
286
wasi_sysroot_path = derive_wasi_sysroot (options , packaging_dir , short_triple ),
300
287
swift_sdk_name = f"{ snapshot_info .swift_version } -{ target_triple } " ,
0 commit comments