Skip to content

Commit 3cd4b63

Browse files
Revert "Support cross compilation in macOS toolchain builds (#62306)" (#62369)
This reverts commit a36ab6e. The change to support cross compilation of `docc` in macOS toolchains is breaking nightly toolchain builds – this will unblock them. It looks like the `--test-product` option Swift-DocC's build script passes to SwiftPM is supported when building for multiple architectures but not when testing. PR toolchain builds don't run tests which is why this wasn't caught before merging. Resolves rdar://102908495
1 parent c0c97e2 commit 3cd4b63

File tree

1 file changed

+0
-7
lines changed
  • utils/swift_build_support/swift_build_support/products

1 file changed

+0
-7
lines changed

utils/swift_build_support/swift_build_support/products/swiftdocc.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ def run_build_script_helper(self, action, host_target, additional_params=[]):
6464
'--build-dir', self.build_dir,
6565
'--multiroot-data-file', MULTIROOT_DATA_FILE_PATH,
6666
]
67-
68-
# Pass Cross compile host info
69-
if self.has_cross_compile_hosts() and self.is_darwin_host(host_target):
70-
helper_cmd += ['--cross-compile-hosts']
71-
for cross_compile_host in self.args.cross_compile_hosts:
72-
helper_cmd += [cross_compile_host]
73-
7467
if action != 'install':
7568
helper_cmd.extend([
7669
# There might have been a Package.resolved created by other builds

0 commit comments

Comments
 (0)