Fix FreeBSD build and test #1149
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci please test |
d-ronnqvist
reviewed
Jan 24, 2025
| @@ -53,6 +56,10 @@ public class Synchronized<Value> { | |||
| lock = UnsafeMutablePointer<pthread_mutex_t>.allocate(capacity: 1) | |||
| lock.initialize(to: pthread_mutex_t()) | |||
| pthread_mutex_init(lock, nil) | |||
| #elseif os(FreeBSD) | |||
| lock = UnsafeMutablePointer<pthread_mutex_t?>.allocate(capacity: 1) | |||
| lock.initialize(to: nil) | |||
There was a problem hiding this comment.
Should this be an initialized to pthread_mutex_t() like above (or rolled into the same #if scopes as the above?
There was a problem hiding this comment.
he main difference on BSD (FreeBSD, OpenBSD) platforms is that the lock type is a pthread_mutex_t? instead of pthread_mutex_t. This is due to on the BSDs, pthread_mutex_t is in fact a struct pthread_mutex pointer, thus it does not come with a default .init() constructor and we need initialize it to nil instead.
ref: http://fxr.watson.org/fxr/source/sys/_pthreadtypes.h?v=FREEBSD-13-STABLE;im=10#L71
d-ronnqvist
approved these changes
Jan 29, 2025
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR fixes building swift-docc on x86_64 FreeBSD
Testing
All test passes!