Skip to content

Don't add -arch explictly to stdlib compile flags on Darwin #60995

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.

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

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Sep 8, 2022

Rely instead on setting the OSX_ARCHITECTURES property (#38415)

Address rdar://96087734

Rely instead on setting the `OSX_ARCHITECTURES` property (swiftlang#38415)

Address rdar://96087734
@edymtt
Copy link
Contributor Author

edymtt commented Sep 8, 2022

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Sep 8, 2022

@swift-ci please build toolchain

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Probably a good idea to check that there aren't other cases that we forgot about.

@etcwilde
Copy link
Member

etcwilde commented Sep 8, 2022

The windows breakage appears to be a missing dependency edge in a circular dependency between swiftAST and swiftBasic. libswiftAST.a contains the InFlightDiagnostic::flush definition, but isn't linked back into libswiftBasic.a, which uses it. Well that's gross.

@etcwilde
Copy link
Member

etcwilde commented Sep 8, 2022

We will probably need #61001 to make the windows build work.
Someone should probably pull the diagnostic bits into swiftBasic and break this link cycle, but later.

@edymtt
Copy link
Contributor Author

edymtt commented Sep 26, 2022

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Sep 26, 2022

@swift-ci please build toolchain

@edymtt edymtt merged commit fc2d621 into swiftlang:main Sep 27, 2022
@edymtt edymtt deleted the remove-redundant-arch-argument-in-darwin branch September 27, 2022 14:35
@edymtt
Copy link
Contributor Author

edymtt commented Sep 27, 2022

From a quick search in CMakeLists.txt/*.cmake files I don't see any other place in which we manually append -arch parameters.

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