Fix installSbtn for apple silicon #7426
Closed
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
eed3si9n
reviewed
Nov 3, 2023
| val isArmArchitecture: Boolean = sys.props | ||
| .getOrElse("os.arch", "") | ||
| .toLowerCase(java.util.Locale.ROOT) == "aarch64" | ||
| val arch = if (Properties.isLinux && isArmArchitecture) "aarch64" else "x86_64" |
There was a problem hiding this comment.
For ipcsocket we created a universal binary, but for sbtn we didn't?
There was a problem hiding this comment.
Doesn't look like it - I downloaded sbt-1.9.7.zip:
> file **/sbtn-*
sbt/bin/sbtn-aarch64-apple-darwin: Mach-O 64-bit executable arm64
sbt/bin/sbtn-aarch64-pc-linux: ELF 64-bit LSB pie executable, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-aarch64.so.1, BuildID[sha1]=95129380deb32d427b65bed01926e14e03defe43, for GNU/Linux 3.7.0, with debug_info, not stripped
sbt/bin/sbtn-x86_64-apple-darwin: Mach-O 64-bit executable x86_64
sbt/bin/sbtn-x86_64-pc-linux: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=c847d01e7dc66b4544e2f97cea0e46952b5554ae, for GNU/Linux 3.2.0, with debug_info, not stripped
sbt/bin/sbtn-x86_64-pc-win32.exe: PE32+ executable (console) x86-64, for MS Windows
There was a problem hiding this comment.
But actually you're right - a fat binary would be much better here.
Can you please point me to the place where the binaries are built before archiving?
It took me embarassing amount of time to get the iterator logic right and I'm super sad to see it being discarded :D
There was a problem hiding this comment.
There's a repo called sbt/sbtn-dist where we send CI job to Cirrus for aarch 64. Not sure how difficult it would be to create another job that waits and combines the outputs.
|
Closing this in favor of #7551 |
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.
(2) is possibly controversial, because using sbtn through rosetta is always problematic.
But I'm just replicating current behaviour