From c57f4916771931866e275b05e1276fdd156af560 Mon Sep 17 00:00:00 2001 From: Ethan Kusters Date: Fri, 2 Dec 2022 10:10:46 -0800 Subject: [PATCH] Revert "Support cross compilation in macOS toolchain builds (#62306)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a36ab6e287afc6c212ad250bfed440d5baf42b16. 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 --- .../swift_build_support/products/swiftdocc.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/utils/swift_build_support/swift_build_support/products/swiftdocc.py b/utils/swift_build_support/swift_build_support/products/swiftdocc.py index d2a39597408fb..5e438591baa2c 100644 --- a/utils/swift_build_support/swift_build_support/products/swiftdocc.py +++ b/utils/swift_build_support/swift_build_support/products/swiftdocc.py @@ -64,13 +64,6 @@ def run_build_script_helper(self, action, host_target, additional_params=[]): '--build-dir', self.build_dir, '--multiroot-data-file', MULTIROOT_DATA_FILE_PATH, ] - - # Pass Cross compile host info - if self.has_cross_compile_hosts() and self.is_darwin_host(host_target): - helper_cmd += ['--cross-compile-hosts'] - for cross_compile_host in self.args.cross_compile_hosts: - helper_cmd += [cross_compile_host] - if action != 'install': helper_cmd.extend([ # There might have been a Package.resolved created by other builds