fix: arm64/x64 inputs may contain universal binaries that are not the same #62
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
One of my dependencies for some reason has two universal binaries per platform, and they are not exactly the same bytewise. I'm unsure why. But I am certain they are functional.
In any case, this error is erroneously being thrown since it fails the previous byte comparison match.
```ts
throw new Error(`Can't reconcile two non-macho files ${file}`);
```
CAFEBABE and FEEDFACE magics for universal binaries. This will allow packaging to continue if both the arm and x64 packages have universal binaries.
|
My actual commit message is incorrect. Feel free to change it or whatever. Just submitted the patch in the GitHub code editor after verifying it by editing the javascript files in my node_modules. |
erickzhao
changed the title
|
Yeah these is indeed such cases. Hope this could be fixed. |
MarshallOfSound
approved these changes
Jun 25, 2023
|
🎉 This PR is included in version 1.4.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One of my dependencies for some reason has universal binaries per platform, and they are not exactly the same bytewise. I'm unsure why. But I am certain they are functional.
In any case, this error is erroneously being thrown since it fails the previous byte comparison match.
CAFEBABE is the magic for universal binaries. This patch also checks to see if both binaries are CAFEBABE. This will allow packaging to continue if both the arm and x64 packages have universal binaries.
https://github.com/apple-opensource-mirror/llvmCore/blob/0c60489d96c87140db9a6a14c6e82b15f5e5d252/include/llvm/Object/MachOFormat.h#L108-L112