Skip to content

Clear up stale values for swift-darwin-supported-archs from CMake caches #61333

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
Sep 28, 2022
Merged

Clear up stale values for swift-darwin-supported-archs from CMake caches #61333

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
6 changes: 6 additions & 0 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,12 @@ def apply_default_arguments(toolchain, args):
if (target.platform.is_darwin and
target.arch in supported_archs)
]
else:
# Clear the value explicitly from CMakeCache.txt
# to avoid picking up a stale value that can cause
# build failures
args.extra_cmake_options.append(
'-USWIFT_DARWIN_SUPPORTED_ARCHS')

# Filter out any macOS stdlib deployment targets that are not supported
# by the macOS SDK.
Expand Down