Skip to content

apeinstall.sh cleanup #1057

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

Merged
merged 4 commits into from
Jan 5, 2024
Merged

apeinstall.sh cleanup #1057

merged 4 commits into from
Jan 5, 2024

Conversation

mrdomino
Copy link
Collaborator

@mrdomino mrdomino commented Jan 5, 2024

  • Use build/bootstrap/make.com if it's available, in case the system make is BSD make.

  • Handle aarch64, rather than installing the x86_64 loader everywhere (fixes apeinstall.sh installs x86_64 loader on aarch64 linux #1050).

  • Detect whether the elf or macho loader is wanted and fetch only that.

  • Print an error and exit on unsupported architectures.

  • Consistently prepend x to uname tests.

  • Use install if available. (Cleans up the temporary M1 loader with a trap.)

- Use `build/bootstrap/make.com` if it's available, in case the system
  make is BSD make.

- Handle aarch64, rather than installing the x86_64 loader everywhere.

- Detect whether the elf or macho loader is wanted and fetch only that.

- Print an error and exit on unsupported architectures.

- Consistently prepend x to uname tests.
Cleans up the temporary Apple Silicon loader with a trap, which also
gets it if the mkdir fails.
@mrdomino
Copy link
Collaborator Author

mrdomino commented Jan 5, 2024

Tested on M1 Mac, aarch64 and x86_64 Linux.

@mrdomino mrdomino requested a review from jart January 5, 2024 18:24
@mrdomino mrdomino changed the title apeinstall.sh cleanup (fixes #1050) apeinstall.sh cleanup Jan 5, 2024
Also updates ape loaders so that this will do something reasonable.

XXX broken on kernels older than 5.12. We should test for this.
@jart jart merged commit 15548b5 into jart:master Jan 5, 2024
@mrdomino mrdomino deleted the apeinstall branch January 5, 2024 22:40
JoshuaWierenga added a commit to JoshuaWierenga/cosmopolitan that referenced this pull request Jan 6, 2024
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.

apeinstall.sh installs x86_64 loader on aarch64 linux
2 participants