Skip to content

Repair the macOS build by adding missing -D in Xcode project #4888

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
merged 1 commit into from
Feb 29, 2024
Merged

Repair the macOS build by adding missing -D in Xcode project #4888

merged 1 commit into from
Feb 29, 2024

Conversation

kateinoigakukun
Copy link
Member

macOS build was broken by 3744d4d, which introduced a new constant definition but did not add it to the Xcode project.

@kateinoigakukun
Copy link
Member Author

@swift-ci test

@kateinoigakukun kateinoigakukun mentioned this pull request Feb 28, 2024
Merged
@kateinoigakukun
Repair the macOS build by adding missing -D in Xcode project
7fa782b 
macOS build was broken by 3744d4d,
which introduced a new constant definition but did not add it to the
Xcode project.
@kateinoigakukun
Copy link
Member Author

@swift-ci test

@kateinoigakukun
Copy link
Member Author

kateinoigakukun commented Feb 29, 2024 •
edited
Loading

The macOS job is still failing but the build failure regression has been resolved https://ci.swift.org/job/swift-corelibs-foundation-PR-macOS/391/

The test failure is another issue. See swiftlang/swift-corelibs-xctest#476

@compnerd
Copy link
Member

I have a similar change in #4886. I don't know which of the two is better - I think that I went through all the cases and added the macro (need to add the Swift version). I'm more interested in getting this fixed rather than which PR we merge.

@compnerd
Copy link
Member

@swift-ci please test

@kateinoigakukun
Copy link
Member Author

kateinoigakukun commented Feb 29, 2024 •
edited
Loading

I think #4886 needs -Xcc too to tell the definition to ClangImporter. I already confirmed this change repaired the build #4888 (comment), so let's merge this after the other required status to be green.

@compnerd
Copy link
Member

Going to merge this to repair the build. We should investigate how to fix the macOS builds.

@compnerd compnerd merged commit b5988f5 into swiftlang:main Feb 29, 2024
@kateinoigakukun kateinoigakukun deleted the yt/repair-macos-build branch February 29, 2024 03:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd Awaiting requested review from compnerd

@MaxDesiatov MaxDesiatov Awaiting requested review from MaxDesiatov

@parkera parkera Awaiting requested review from parkera

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
@kateinoigakukun @compnerd