Skip to content

[SourceKit] don't build libdispatch shared library twice, other than on Mac/Windows #31038

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

Closed
wants to merge 1 commit into from

Conversation

finagolfin
Copy link
Member

Reboots #30096, now disabling the extra build of libdispatch altogether. I simply disabled the install before, as I wasn't sure if some other needed libdispatch headers were also installed by this, but I checked and those are installed later anyway.

@drexin, if you can kick off the CI, let's see what fails.

@drexin
Copy link
Contributor

drexin commented Apr 15, 2020

@swift-ci smoke test

@gottesmm
Copy link
Contributor

@buttaface what's the high level here? Why isn't this needed on these other platforms. If a specific platform doesn't support them we should special case that instead. Can you explain this to me?

@drexin
Copy link
Contributor

drexin commented Apr 15, 2020

@buttaface I think I found the actual culprit and put up a PR: #31048

I don't know why reverting your patch appeared to fix the problem, but I ran into it again, which made me take a closer look.

@drexin
Copy link
Contributor

drexin commented Apr 15, 2020

So I think we can revert my revert of your original PR @buttaface. Sorry for the hassle.

@finagolfin
Copy link
Member Author

@drexin, would you like me to submit the patch from #30096 again or can you just revert the revert?

@gottesmm, see #30096, the installed toolchain was unnecessarily installing libdispatch.so/libBlocksruntime.so twice, at least on ELF platforms based on the rpath (I haven't checked mac/Windows and don't know much about how their runtime path works, so I always left those two alone). I thought maybe even building it in libdispatch-prefix was unneeded, but maybe I missed something.

@finagolfin
Copy link
Member Author

Closing for #31064.

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