Skip to content

Architecture tweaks for JRuby on M1#7132

Merged
headius merged 3 commits intojruby:jruby-9.3from
headius:macos_arm64_makefile
Mar 10, 2022
Merged

Architecture tweaks for JRuby on M1#7132
headius merged 3 commits intojruby:jruby-9.3from
headius:macos_arm64_makefile

Conversation

@headius
Copy link
Member

@headius headius commented Mar 10, 2022

In sass/sassc-ruby#231 it was reported that JRuby builds an improper ARCH_FLAG on MacOS/M1, using aarch64 when it should use arm64. This PR fixes that.

This may be an appropriate change for other aarch64 platforms depending on what the compiler wants, but I do not currently have a working Linux/aarch64 system on which to test it.

I also noticed that the -v output on JRuby reverses the arch and OS compared to CRuby, so this PR fixes that as well.

Two spec tags are updated to the new arm64 arch name on darwin.

headius added 3 commits March 10, 2022 11:46
This should allow sassc and other external libraries to build
using the makefile configuration bits in rbconfig.

See sass/sassc-ruby#231
@ahorek
Copy link
Contributor

ahorek commented Mar 10, 2022

arm64 is specific to Darwin, so the platform name shouldn't be changed on other aarch64 platforms,

I have an aarch64/Linux VM up, so just let me know if you need to test something.

@headius
Copy link
Member Author

headius commented Mar 10, 2022

@ahorek Ok thanks for confirming this and your other fix for the -m flag. I'll merge this, but perhaps your other one can be retargeted at 9.3? We want to continue improving M1 support in the 9.3 line.

@headius headius merged commit ccb0348 into jruby:jruby-9.3 Mar 10, 2022
@headius headius deleted the macos_arm64_makefile branch March 10, 2022 22:05
@headius
Copy link
Member Author

headius commented Mar 10, 2022

retargeted at 9.3

Oh nevermind, I guess it was already targeted at 9.3. Merged!

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.

2 participants