Skip to content

Revert "[Build System: CMake] make add_swift_library a wrapper to add_llvm_library" #20247

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
Nov 2, 2018

Conversation

nkcsgexi
Copy link
Contributor

@nkcsgexi nkcsgexi commented Nov 2, 2018

This patch caused some merge conflicts. Defer to @gottesmm to merge and resolve the conflicts when he is available.

@nkcsgexi nkcsgexi merged commit 3dfedf0 into master Nov 2, 2018
@nkcsgexi nkcsgexi requested review from compnerd and gottesmm November 2, 2018 19:54
@gottesmm
Copy link
Contributor

gottesmm commented Nov 2, 2018

@nkcsgexi I think this was unreasonable to revert. Why should @compnerd have to revert something b/c of breakage in internal branches that he doesn't have access to? That is the responsibility of us and shouldn't revert in a public revert.

That being said, you already did the revert so I will help with the merge-conflict later when I am available.

@jrose-apple jrose-apple deleted the revert-19514-breakup branch November 2, 2018 20:35
@nkcsgexi
Copy link
Contributor Author

nkcsgexi commented Nov 2, 2018

@gottesmm Thank you for looking into the merge conflicts!

@gottesmm
Copy link
Contributor

gottesmm commented Nov 3, 2018

@nkcsgexi no worries! Happy to help = ).

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.

2 participants