Skip to content

build: simplify macOS path (NFC) #32120

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
merged 1 commit into from
Jun 2, 2020
Merged

Conversation

compnerd
Copy link
Member

@compnerd compnerd commented Jun 1, 2020

It does not make sense to use the cl frontend to clang to build for
macOS. Remove the unnecessary condition and always perform the
operation.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

It does not make sense to use the `cl` frontend to clang to build for
macOS.  Remove the unnecessary condition and always perform the
operation.
@compnerd
Copy link
Member Author

compnerd commented Jun 1, 2020

CC: @edymtt @drexin

@compnerd
Copy link
Member Author

compnerd commented Jun 1, 2020

@swift-ci please test

@swift-ci
Copy link
Contributor

swift-ci commented Jun 1, 2020

Build failed
Swift Test Linux Platform
Git Sha - f5a75dc

Copy link
Contributor

@drexin drexin left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@drexin
Copy link
Contributor

drexin commented Jun 1, 2020

@swift-ci test linux

@swift-ci
Copy link
Contributor

swift-ci commented Jun 1, 2020

Build failed
Swift Test Linux Platform
Git Sha - f5a75dc

@compnerd
Copy link
Member Author

compnerd commented Jun 1, 2020

@swift-ci please test Linux platform

@compnerd compnerd merged commit ec60746 into swiftlang:master Jun 2, 2020
@compnerd compnerd deleted the macOS-cl branch June 2, 2020 15:33
edymtt added a commit that referenced this pull request Jul 1, 2020
As part of this refactor some code touched as part of #31794 to better fit into the work done in #32120 -- in detail

* `_add_host_variant_c_compile_link_flags` is now invoked by both add_swift_host_library and add_swift_host_library
* `_add_host_variant_c_compile_link_flags` now sets the target in linker arguments when building against Apple SDKs

Addresses rdar://64911978
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