From f022237039afc81961dd9b68154a8c5f717342fe Mon Sep 17 00:00:00 2001 From: Eric Miotto <1094986+edymtt@users.noreply.github.com> Date: Fri, 2 Sep 2022 06:23:58 -0700 Subject: [PATCH 1/2] Allow cross-compilation on Apple Silicon Address rdar://99486698 --- Utilities/build-script-helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/build-script-helper.py b/Utilities/build-script-helper.py index 28729e5c7..a211de7b3 100755 --- a/Utilities/build-script-helper.py +++ b/Utilities/build-script-helper.py @@ -137,7 +137,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]: build_target = get_build_target(swift_exec, args) if args.cross_compile_host: - if build_target == 'x86_64-apple-macosx' and args.cross_compile_host == "macosx-arm64": + if re.match('macosx-', args.cross_compile_host): swiftpm_args += ["--arch", "x86_64", "--arch", "arm64"] elif re.match('android-', args.cross_compile_host): print('Cross-compiling for %s' % args.cross_compile_host) From 6547907a85954aeedbc79ccd45db51e12c7db480 Mon Sep 17 00:00:00 2001 From: Eric Miotto <1094986+edymtt@users.noreply.github.com> Date: Mon, 5 Sep 2022 07:04:24 -0700 Subject: [PATCH 2/2] Incorporate feedback from swift-package-manager#5755 --- Utilities/build-script-helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/build-script-helper.py b/Utilities/build-script-helper.py index a211de7b3..17ad9e30b 100755 --- a/Utilities/build-script-helper.py +++ b/Utilities/build-script-helper.py @@ -137,7 +137,7 @@ def get_swiftpm_options(swift_exec: str, args: argparse.Namespace) -> List[str]: build_target = get_build_target(swift_exec, args) if args.cross_compile_host: - if re.match('macosx-', args.cross_compile_host): + if re.search('-apple-macosx', build_target) and re.match('macosx-', args.cross_compile_host): swiftpm_args += ["--arch", "x86_64", "--arch", "arm64"] elif re.match('android-', args.cross_compile_host): print('Cross-compiling for %s' % args.cross_compile_host)