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

Update config scripts to compile for Apple Silicon (arm64) #2700

Closed
wants to merge 1 commit into from

Conversation

markpeek
Copy link
Contributor

Detect Apple Silicon (arm64) during configuration for compilation on macOS 11.0 (beta at this time). Fixes ERL-1305.

Main changes:

  • Fix the integer macOS version correctly for the build version check
  • Map correctly to 64bit builds (-m64)

Verified via ./otp_build tests

Note: the current config.guess uses "arm-apple-darwin*" for the build/host system type while a newer version uses "aarch64-apple-darwin*". However, the diffs between 2015-03-04 to 2020-07-12 were outside the scope of being able to test for this PR.

@CLAassistant
Copy link

CLAassistant commented Jul 29, 2020

CLA assistant check
All committers have signed the CLA.

erts/aclocal.m4 Outdated Show resolved Hide resolved
@rickard-green rickard-green added the team:VM Assigned to OTP team VM label Jul 31, 2020
Detect Apple Silicon (arm64) during configuration for compilation
on macOS 11.0 (beta at this time).
@markpeek
Copy link
Contributor Author

@rickard-green PR updated per your review.

@rickard-green rickard-green self-assigned this Aug 3, 2020
@rickard-green rickard-green added the testing currently being tested, tag is used by OTP internal CI label Aug 3, 2020
@rickard-green rickard-green changed the base branch from master to maint August 4, 2020 08:31
@rickard-green rickard-green changed the base branch from maint to master August 4, 2020 08:32
@rickard-green
Copy link
Contributor

rickard-green commented Aug 4, 2020

Please rebase this onto the maint branch, so we can release it in next maintenance patch (OTP 23.1). Now it is based on master which is for the next release (OTP 24).

@rickard-green
Copy link
Contributor

I've rebased this to maint and merged it

@michaelklishin
Copy link
Contributor

Any chance this can get into maint-22 and such for us poor souls on Big Sur who have to occasionally test on Erlang 22.3?

@amarBitMan
Copy link

amarBitMan commented Apr 24, 2021

@rickard-green
Can we get the fix for erlang 20.3 also?

@rickard-green
Copy link
Contributor

@amar1994 Sorry, no OTP 20 is not maintained anymore

@amarBitMan
Copy link

@rickard-green:
Is there any workaround for this (I mean getting the fix on a custom version of OTP-20)?

@rickard-green
Copy link
Contributor

You want to cherry-pick the following commits onto the base commit of your choice (the once marked "test" only affect test-cases):

Hopefully they should be possible to cherry-pick to a late OTP 20 without conflicts, but that is not guaranteed.

@amarBitMan
Copy link

@rickard-green
I cherry-picked the above commits on top of the maint-20 branch. But when I tried to build and install it using kerl, it was installed as erlang 24.
When I type erl after activating it, getting following output ->

➜  otp git:(maint-20) erl
Erlang/OTP 24 [RELEASE CANDIDATE 3] [erts-11.2] [source-dae6cd7fad] [64-bit] [smp:8:8] [ds:8:8:10] [async-threads:1]

Eshell V11.2  (abort with ^G)
1>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
team:VM Assigned to OTP team VM testing currently being tested, tag is used by OTP internal CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants