Skip to content
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

fix: Try avoid more symbol collisions #5

Merged
merged 1 commit into from
Apr 23, 2024

Conversation

flub
Copy link
Contributor

@flub flub commented Apr 22, 2024

This targets aarch64-linux.

Closes n0-computer/iroh#2217

This targets aarch64-linux.
@flub
Copy link
Contributor Author

flub commented Apr 22, 2024

@cameronfyfe Could you test with this branch? Ci suggests I may have done this correctly but it's a bit hard to tell. It seems the neon symbols were not yet duplicated, which is probably what you ran into.

If this fails please give me the compilation failures, it may take some trial and error to get all symbols sorted.

@flub flub force-pushed the flub/aarch64-linux-symbol-collisions branch from 271c7f8 to 21d060f Compare April 22, 2024 10:10
@flub
Copy link
Contributor Author

flub commented Apr 22, 2024

I'm not going to bother with getting mac ci green. not my fight today.

@cameronfyfe
Copy link

cameronfyfe commented Apr 22, 2024

@flub thanks for looking into this so quickly, I patched iroh-blake3 with this PR and builds passed on all our platforms: x86-linux, aarch64-linux, aarch64-darwin

@flub flub requested a review from rklaehn April 23, 2024 07:16
@flub
Copy link
Contributor Author

flub commented Apr 23, 2024

@flub thanks for looking into this so quickly, I patched iroh-blake3 with this PR and builds passed on all our platforms: x86-linux, aarch64-linux, aarch64-darwin

thanks for testing!

@flub flub merged commit 77aaf09 into master Apr 23, 2024
84 of 98 checks passed
@flub flub deleted the flub/aarch64-linux-symbol-collisions branch April 23, 2024 07:37
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.

Symbol collisions when building with both iroh and ssi crates as dependencies
3 participants