-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[build] Don't reset 'swiftlib_link_flags_all' unnecessarily #30020
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
Conversation
Quite possibly, but I won’t be able to definitively test it until it is merged and Azure has created an artifact with it. I left a reminder for myself to check in a few days. |
@swift-ci please test |
Build failed |
Build failed |
Both CI failures appear to be spurious: the mac one didn't even get past git checkout of other Swift repositories, while I have no idea why that SwiftPM test would fail on linux, as it passed for me locally on an Android host with this pull. |
@swift-ci please test |
Good to go? |
I think @devincoughlin should pitch in before merging this. The line might be internally important for Apple, but it is obviously affecting some other platforms. In the meantime, can you adapt this after #29807? |
b0498fa
to
c2a73c8
Compare
Rebased. |
@swift-ci please test |
Build failed |
Build failed |
@devincoughlin, this broke the Android SDK a couple months ago, can you chime in? |
I think we can go ahead with this, it's fairly obvious that he made a mistake. |
Ping @CodaFi, the Swift SDK for Android has been broken for the last couple months since this line slipped in, would be good to get this in before the 5.3 branch. |
I am not the right person to review CMake changes. Saleem added this line, so @compnerd could you look this over? |
No, that's what a quick @CodaFi, I was just hoping you'd prod someone about this, or it's a really simple one-line removal to review, which doesn't really make sense before this patch, as explained in the OP. |
Ah, then @devincoughlin is probably right. |
@CodaFi I think that this is correct, but it should be tested with the catalyst build as it was previously dropping the linker flags. |
Given that it is dropping flags, let’s merge cause the flags should be applied, we can filter our flags that catalyst may end up with issues on. |
@buttaface, the issue I noted is no longer a problem (though so much time passed in between that it’s hard to say whether this was the thing that fixed it). |
Well, it should be pretty easy, just check what commit of Swift master worked, because this pull was just reverted. If the few commits with this patch work, but the latest master doesn't, you know that this fixed it (or maybe the builds you're using have this and other fixes locally applied, I don't know what they do). |
Done in #29017 but this variable has already been set just above, so all subsequent flags added are wiped, which breaks setting the soname for target libraries on Android (@SDGGiesbrecht, let me know if this patch fixes the Android linking issue you mentioned on the forum, it should), among others.
@devincoughlin, I don't know if this was a temporary change you needed or if those prior modified flags were affecting your Catalyst work somehow, let me know.