Skip to content

Conversation

@mikeash
Copy link
Contributor

@mikeash mikeash commented May 20, 2024

Cherry-pick #73761 to release/6.0.

SWIFT_BNI_OS_BUILD isn't exactly what we need. Use an option to turn it on/off instead.

rdar://128408295

SWIFT_BNI_OS_BUILD isn't exactly what we need. Use an option to turn it on/off instead.

rdar://128408295
(cherry picked from commit 7f2d4be)
@mikeash mikeash requested a review from a team as a code owner May 20, 2024 21:41
@mikeash
Copy link
Contributor Author

mikeash commented May 21, 2024

@swift-ci please test

@mikeash
Copy link
Contributor Author

mikeash commented May 22, 2024

Explanation: Use a build-time option to control whether we call the may-or-may-not-be-present function _os_trace_lazy_init_completed_4swift, instead of my previous bad and incorrect attempt to determine it automatically.
Original PR: #73761
Reviewed by: @edymtt
Risk: Low. Adds a new build-time configuration, to choose which code path to take, both paths already tested.
Resolves: rdar://128408295
Tests: Ran builds with and without the new option to make sure it does what we want.

@mikeash mikeash enabled auto-merge May 22, 2024 15:19
@mikeash mikeash merged commit c2f2f20 into swiftlang:release/6.0 May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants