Skip to content

Build fat when CROSS_COMPILE_HOSTS is set #2859

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 1 commit into from
Aug 11, 2020
Merged

Build fat when CROSS_COMPILE_HOSTS is set #2859

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions Utilities/bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,10 @@ def parse_build_args(args):
args.clang_path = get_clang_path(args)
args.cmake_path = get_cmake_path(args)
args.ninja_path = get_ninja_path(args)
args.target_dir = os.path.join(args.build_dir, get_build_target(args))
if os.getenv("CROSS_COMPILE_HOSTS"): # Use XCBuild target directory when building for multiple arches.
args.target_dir = os.path.join(args.build_dir, "apple/Products")
else:
args.target_dir = os.path.join(args.build_dir, get_build_target(args))
args.bootstrap_dir = os.path.join(args.target_dir, "bootstrap")
args.conf = 'release' if args.release else 'debug'
args.bin_dir = os.path.join(args.target_dir, args.conf)
Expand Down Expand Up @@ -312,7 +315,8 @@ def install(args):
# Install the swiftmodule and swiftdoc files.
for module in libswiftpm_modules:
install_binary(args, module + ".swiftmodule", dest)
install_binary(args, module + ".swiftdoc", dest)
if not os.getenv("CROSS_COMPILE_HOSTS"): # When compiling for multiple arches, swiftdoc is part of the swiftmodule directory
install_binary(args, module + ".swiftdoc", dest)

# Install the C headers.
tscclibc_include_dir = os.path.join(args.tsc_source_dir, "Sources/TSCclibc/include")
Expand Down Expand Up @@ -358,7 +362,10 @@ def install_binary(args, binary, dest_dir):
note("Installing %s to %s" % (src, dest))

mkdir_p(os.path.dirname(dest))
file_util.copy_file(src, dest, update=1)
if os.path.isdir(src) and os.getenv("CROSS_COMPILE_HOSTS"): # Handle swiftmodule directories if compiling for multiple arches.
dir_util.copy_tree(src, dest)
else:
file_util.copy_file(src, dest, update=1)

# -----------------------------------------------------------
# Build functions
Expand Down Expand Up @@ -453,12 +460,21 @@ def build_swiftpm_with_swiftpm(args):
"""Builds SwiftPM using the version of SwiftPM built with CMake."""
note("Building SwiftPM (with swift-build)")

call_swiftpm(args, [
swiftpm_args = [
"SWIFT_EXEC=" + args.swiftc_path,
"SWIFTPM_PD_LIBS=" + os.path.join(args.bootstrap_dir, "pm"),
os.path.join(args.bootstrap_dir, "bin/swift-build"),
"--disable-sandbox",
])
]

build_target = get_build_target(args)
cross_compile_host = os.getenv("CROSS_COMPILE_HOSTS")
if build_target == 'x86_64-apple-macosx' and cross_compile_host == "macosx-arm64":
swiftpm_args += ["--arch", "x86_64", "--arch", "arm64"]
elif cross_compile_host:
error("cannot cross-compile for %s" % cross_compile_host)

call_swiftpm(args, swiftpm_args)

# Setup symlinks that'll allow using swiftpm from the build directory.
symlink_force(args.swiftc_path, os.path.join(args.target_dir, args.conf, "swiftc"))
Expand Down