Skip to content

[6.0] Two small cherry-picks to improve build stability #73232

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
Apr 25, 2024
Merged

[6.0] Two small cherry-picks to improve build stability #73232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740f299
[cmake] Make the hosttools lib SwiftMacros a dependency of the stdlib…
gottesmm Apr 24, 2024
783d654
[concurrency] Add REQUIRES: asserts to a test.
gottesmm Apr 24, 2024
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
5 changes: 4 additions & 1 deletion stdlib/cmake/modules/SwiftSource.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,10 @@ function(_compile_swift_files
if(SWIFT_INCLUDE_TOOLS AND NOT BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")
# Depend on the binary itself, in addition to the symlink, unless
# cross-compiling the compiler.
set(swift_compiler_tool_dep "swift-frontend${target_suffix}")
list(APPEND swift_compiler_tool_dep "swift-frontend${target_suffix}")

# If we aren't cross compiling, also depend on SwiftMacros.
list(APPEND swift_compiler_tool_dep SwiftMacros)
endif()

# If there are more than one output files, we assume that they are specified
Expand Down
1 change: 1 addition & 0 deletions test/Concurrency/isolated_parameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// RUN: %target-swift-frontend -disable-availability-checking -strict-concurrency=complete %s -emit-sil -o /dev/null -verify -verify-additional-prefix complete- -disable-region-based-isolation-with-strict-concurrency
// RUN: %target-swift-frontend -disable-availability-checking -strict-concurrency=complete %s -emit-sil -o /dev/null -verify

// REQUIRES: asserts
// REQUIRES: concurrency
// REQUIRES: swift_swift_parser

Expand Down