Skip to content

bootstrap: generalize check for cross-compilation on Darwin #5755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 7, 2022
Merged

bootstrap: generalize check for cross-compilation on Darwin #5755

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d154dbe
bootstrap: generalize check for cross-compilation on Darwin
edymtt Sep 2, 2022
90c5645
Integrate review feedback
edymtt Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,12 +815,13 @@ def get_swiftpm_flags(args):

build_target = get_build_target(args)
cross_compile_hosts = args.cross_compile_hosts
if build_target == 'x86_64-apple-macosx' and "macosx-arm64" in cross_compile_hosts:
build_flags += ["--arch", "x86_64", "--arch", "arm64"]
elif cross_compile_hosts and re.match('android-', cross_compile_hosts):
build_flags.extend(["--destination", args.cross_compile_config])
elif cross_compile_hosts:
error("cannot cross-compile for %s" % cross_compile_hosts)
if cross_compile_hosts:
if re.search('-apple-macosx', build_target) and re.match('macosx-', cross_compile_hosts):
build_flags += ["--arch", "x86_64", "--arch", "arm64"]
elif re.match('android-', cross_compile_hosts):
build_flags.extend(["--destination", args.cross_compile_config])
else:
error("cannot cross-compile for %s" % cross_compile_hosts)

# Ensure we are not sharing the module cache with concurrent builds in CI
local_module_cache_path=os.path.join(args.build_dir, "module-cache")
Expand Down