Skip to content

Guard errnos not available on FreeBSD #212

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

Jump to bottom
Merged
michael-yuji merged 4 commits into from
Jan 18, 2025
Merged

Guard errnos not available on FreeBSD #212

michael-yuji merged 4 commits into from
Jan 18, 2025

Conversation

@michael-yuji
Copy link
Member

@michael-yuji michael-yuji commented Jan 17, 2025

No description provided.

glessard
glessard reviewed Jan 17, 2025
View reviewed changes
@glessard
Copy link
Contributor

glessard commented Jan 17, 2025 •
edited
Loading

@michael-yuji does this allow the package to build successfully on FreeBSD?

@michael-yuji
Copy link
Member Author

michael-yuji commented Jan 17, 2025

@michael-yuji does this make the package build successfully on FreeBSD?

yup it does!
This reminds me to also patch the tests too...

➜  swift-system git:(freebsd-wip) uname -a && swift build
FreeBSD i9bsd 14.1-RELEASE-p6 FreeBSD 14.1-RELEASE-p6 releng/14.1-n267727-74b6c983723c GENERIC amd64
Building for debugging...
[1/1] Write swift-version-13DC4D259FF33919.txt
Build complete! (0.08s)
➜  swift-system git:(freebsd-wip)

@glessard
Copy link
Contributor

glessard commented Jan 17, 2025

You can add the test changes here if they're not too extensive. Having all the changes together would be ideal. Thanks!

@michael-yuji
Copy link
Member Author

michael-yuji commented Jan 17, 2025

Took the suggested changes and updated the PR to include fixes for tests.

@glessard
Copy link
Contributor

glessard commented Jan 17, 2025

@swift-ci please test

glessard
glessard reviewed Jan 17, 2025
View reviewed changes
Tests/SystemTests/ErrnoTest.swift Outdated
XCTAssert(ENODATA == Errno.noData.rawValue)
XCTAssert(ENOLINK == Errno.noLink.rawValue)
XCTAssert(EPROTO == Errno.protocolError.rawValue)
#if !os(FreeBSD)
Copy link
Contributor

@glessard glessard Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be more straightforward to have #if !os(Windows) ... #endif followed by #if !os(Windows) && !os(FreeBSD) ... #endif.

Copy link
Member Author

@michael-yuji michael-yuji Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ya... nested ifdefs are quite gross...

Copy link
Contributor

@glessard glessard Jan 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. It's better to keep a mind-numbing list as simple as possible =)

@michael-yuji
Copy link
Member Author

michael-yuji commented Jan 17, 2025

@swift-ci please test

@glessard
Copy link
Contributor

glessard commented Jan 17, 2025

@swift-ci please test

@michael-yuji michael-yuji merged commit 4fa2a71 into apple:main Jan 18, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@glessard glessard glessard approved these changes

@lorentey lorentey Awaiting requested review from lorentey lorentey is a code owner

@milseman milseman Awaiting requested review from milseman milseman is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@michael-yuji @glessard