Skip to content

Commit fa299d2

Browse files
package-toolchain: Remove host_toolchain_path argument
1 parent 193e2c6 commit fa299d2

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

tools/build/package-toolchain

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ class PackageSwiftSDKAction(Action):
8080
def __init__(
8181
self, options, snapshot_info: SnapshotInfo,
8282
base_toolchain_path: str,
83-
host_toolchain_path: Optional[str],
8483
target_toolchain_path: str,
8584
wasi_sysroot_path: str,
8685
swift_sdk_name: str,
@@ -89,7 +88,6 @@ class PackageSwiftSDKAction(Action):
8988
super().__init__(options)
9089
self.snapshot_info = snapshot_info
9190
self.base_toolchain_path = base_toolchain_path
92-
self.host_toolchain_path = host_toolchain_path
9391
self.target_toolchain_path = target_toolchain_path
9492
self.wasi_sysroot_path = wasi_sysroot_path
9593
self.swift_sdk_name = swift_sdk_name
@@ -101,7 +99,6 @@ class PackageSwiftSDKAction(Action):
10199
copy_libxml2_libs(build_sdk_path, self.target_toolchain_path, self.target_triple)
102100
self.make_swift_sdk(
103101
self.base_toolchain_path,
104-
self.host_toolchain_path,
105102
self.target_toolchain_path,
106103
self.wasi_sysroot_path,
107104
self.swift_sdk_name,
@@ -111,7 +108,6 @@ class PackageSwiftSDKAction(Action):
111108
def make_swift_sdk(
112109
self,
113110
base_toolchain_path: str,
114-
host_toolchain_path: Optional[str],
115111
target_toolchain_path: str,
116112
wasi_sysroot_path: str,
117113
swift_sdk_name: str,
@@ -122,9 +118,6 @@ class PackageSwiftSDKAction(Action):
122118
123119
:param base_toolchain_path: The path to the base toolchain, which
124120
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.
128121
:param target_toolchain_path: The path to the target toolchain, which
129122
contains the cross-compiled Swift standard library and SDK for
130123
WebAssembly.
@@ -142,11 +135,6 @@ class PackageSwiftSDKAction(Action):
142135
"--swift-version", self.snapshot_info.swift_version,
143136
"--sdk-name", swift_sdk_name,
144137
]
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-
]
150138
print("=====> Building Swift SDK")
151139
print(" ".join(sdk_generator_args))
152140
self.system(*sdk_generator_args)
@@ -294,7 +282,6 @@ def main():
294282
actions.append(PackageSwiftSDKAction(
295283
options, snapshot_info,
296284
base_toolchain_path=os.path.join(packaging_dir, 'base-snapshot'),
297-
host_toolchain_path=None,
298285
target_toolchain_path=os.path.join(packaging_dir, 'target-toolchain', target_triple),
299286
wasi_sysroot_path=derive_wasi_sysroot(options, packaging_dir, short_triple),
300287
swift_sdk_name=f"{snapshot_info.swift_version}-{target_triple}",

0 commit comments

Comments
 (0)