Skip to content

[5.3] [Preset] Source compat suite cross compile for macOS arm64 #33779

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 5 commits into from
Sep 3, 2020
Merged

[5.3] [Preset] Source compat suite cross compile for macOS arm64 #33779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07c379c
[Preset] Source compat suite cross compile for macOS arm64
shahmishal Aug 4, 2020
4000085
[Build System] Move host lipo step after install step
shahmishal Aug 13, 2020
e56821c
Remove old symlink before creating new symlink
shahmishal Aug 13, 2020
d5298f9
Clean up the whitespace in build-script
shahmishal Aug 14, 2020
a4356ab
[CMake] Remove a redundant and potentially incorrect check.
Jul 6, 2020
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
17 changes: 0 additions & 17 deletions cmake/modules/DarwinSDKs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,6 @@ set(SUPPORTED_WATCHOS_ARCHS "armv7k")
set(SUPPORTED_WATCHOS_SIMULATOR_ARCHS "i386;arm64")
set(SUPPORTED_OSX_ARCHS "x86_64;arm64;arm64e")

# Get the SDK version from SDKSettings.
execute_process(
COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "Version"
OUTPUT_VARIABLE SWIFT_OSX_SDK_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE)

# Remove the last component, if any. e.g. 10.15.26 -> 10.15
string(REGEX REPLACE "\([0-9]*[.][0-9]*\)[.][0-9]*" "\\1"
SWIFT_OSX_SDK_VERSION "${SWIFT_OSX_SDK_VERSION}")

if (${SWIFT_OSX_SDK_VERSION} STREQUAL "10.14" OR
${SWIFT_OSX_SDK_VERSION} STREQUAL "10.15")
set(SUPPORTED_OSX_ARCHS "x86_64")
else()
set(SUPPORTED_OSX_ARCHS "x86_64;arm64e")
endif()

is_sdk_requested(OSX swift_build_osx)
if(swift_build_osx)
configure_sdk_darwin(
Expand Down
4 changes: 4 additions & 0 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2379,21 +2379,25 @@ swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;s
mixin-preset=source_compat_suite_macos_base
debug
assertions
cross-compile-hosts=macosx-arm64

[preset: source_compat_suite_macos_RA]
mixin-preset=source_compat_suite_macos_base
release
assertions
cross-compile-hosts=macosx-arm64

[preset: source_compat_suite_macos_R]
mixin-preset=source_compat_suite_macos_base
release
no-assertions
cross-compile-hosts=macosx-arm64

[preset: source_compat_suite_macos_D]
mixin-preset=source_compat_suite_macos_base
debug
no-assertions
cross-compile-hosts=macosx-arm64

[preset: source_compat_suite_linux_DA]
mixin-preset=source_compat_suite_linux_base
Expand Down
6 changes: 3 additions & 3 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,9 @@ class BuildScriptInvocation(object):
for product_class in impl_product_classes:
self._execute_install_action(host_target, product_class)

# Lipo...
self._execute_merged_host_lipo_action()

# Non-build-script-impl products...
# Note: currently only supports building for the host.
for host_target in [self.args.host_target]:
Expand Down Expand Up @@ -957,9 +960,6 @@ class BuildScriptInvocation(object):
for host_target in all_hosts:
self._execute_package_action(host_target)

# Lipo...
self._execute_merged_host_lipo_action()

def _execute_build_action(self, host_target, product_class):
action_name = "{}-{}-build".format(host_target.name,
product_class.product_name())
Expand Down
3 changes: 3 additions & 0 deletions utils/recursive-lipo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ def merge_lipo_files(src_root_dirs, file_list, copy_verbatim_subpaths,
if all([os.path.islink(item) for item in file_paths]):
# It's a symlink in all found instances, copy the link.
print("-- Creating symlink %s" % dest_path)
# Remove symlink if it already exists
if os.path.islink(dest_path):
os.remove(dest_path)
os.symlink(os.readlink(file_paths[0]), dest_path)
elif all([os.path.isdir(item) for item in file_paths]):
# It's a subdir in all found instances.
Expand Down