Skip to content

[CMake][NFC] Remove unused logic to choose swift component #26312

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
Jul 24, 2019

Conversation

bulbazord
Copy link
Contributor

add_swift_target_library should always have TARGET_LIBRARY set. A few
lines down, there is a precondition that makes sure that it is set. This
check and subsequent assignment of SWIFTLIB_INSTALL_IN_TARGET should
never get triggered.

cc @compnerd @gottesmm @Rostepher

add_swift_target_library should always have `TARGET_LIBRARY` set. A few
lines down, there is a precondition that makes sure that it is set. This
check and subsequent assignment of `SWIFTLIB_INSTALL_IN_TARGET` should
never get triggered.
@bulbazord
Copy link
Contributor Author

@swift-ci please smoke test

@gottesmm
Copy link
Contributor

Can you hoist the precondition check to the top and then remove all references to it?

@bulbazord
Copy link
Contributor Author

bulbazord commented Jul 23, 2019

Can you hoist the precondition check to the top and then remove all references to it?

I can hoist the precondition but what do you mean "remove all references to it"?

@gottesmm
Copy link
Contributor

@xiaobai sorry I meant can we just eliminate it? And debride. Sorry I was typing quickly.

@Rostepher
Copy link
Contributor

Rostepher commented Jul 24, 2019

@gottesmm do you mean removing the TARGET_LIBRARY option altogether? That would be a much larger change, but possibly sensible since this function is now focused completely on the target library use-case.

@compnerd
Copy link
Member

compnerd commented Jul 24, 2019

@Rostepher - yeah, this was something that @gottesmm and I had chatted about. The desire is to remove the flag since it should never be used for non-target libraries. Yes, it is a larger change, but is part of the simplifications that will pay large dividends as we start pruning all the custom handling of build rules.

@gottesmm I think that removing the flag in a follow up is a reasonable approach. This just removes the unnecessary variable set.

@gottesmm
Copy link
Contributor

Yes. Everything that is passed there should have TARGET_LIBRARY set. That means we should debride.

@gottesmm
Copy link
Contributor

@compnerd I am fine with that. As long as the follow up commit happens.

@compnerd compnerd merged commit 7767d07 into swiftlang:master Jul 24, 2019
@bulbazord bulbazord deleted the unneeded-install-component branch July 24, 2019 18:01
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.

4 participants