diff options
| author | Mark Peek <mark@peek.org> | 2020-07-28 18:50:17 -0700 |
|---|---|---|
| committer | Björn Gustavsson <bjorn@erlang.org> | 2021-02-18 12:04:00 +0100 |
| commit | fd86ab1897f264696b081eed1a5c8112892c0fea (patch) | |
| tree | c7636a3a1125b8d33cac58605bfedf8c744ae891 | |
| parent | 43f33b40aef5b6304105bd5b3b3d9d0412a7e5ef (diff) | |
| download | erlang-fd86ab1897f264696b081eed1a5c8112892c0fea.tar.gz | |
Update config scripts to compile for Apple Silicon (arm64)
Detect Apple Silicon (arm64) during configuration for compilation
on macOS 11.0 (beta at this time).
(This is a partial cherry-pick of b93b9f95438.)
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | erts/aclocal.m4 | 1 | ||||
| -rw-r--r-- | erts/configure.in | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b90bda1763..1d12948441 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ armv7l-unknown-linux-gnueabihf i686-pc-linux-gnu x86_64-unknown-linux-gnu i386-apple-darwin[0-9]*.[0-9]*.[0-9]* +arm-apple-darwin[0-9]*.[0-9]*.[0-9]* x86_64-apple-darwin[0-9]*.[0-9]*.[0-9]* sparc-sun-solaris[0-9]*.[0-9]* i386-pc-solaris[0-9]*.[0-9]* diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 index d73bf3ccc2..9a1eb48a87 100644 --- a/erts/aclocal.m4 +++ b/erts/aclocal.m4 @@ -2803,6 +2803,7 @@ AC_DEFUN([LM_HARDWARE_ARCH], [ ppc64) ARCH=ppc64;; ppc64le) ARCH=ppc64le;; "Power Macintosh") ARCH=ppc;; + arm64) ARCH=arm64;; armv5b) ARCH=arm;; armv5teb) ARCH=arm;; armv5tel) ARCH=arm;; diff --git a/erts/configure.in b/erts/configure.in index 3ba8216a19..9fd50c7699 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -733,7 +733,7 @@ dnl First remove common_tests skip file. dnl Adjust LDFLAGS to allow 64bit linkage on DARWIN case $ARCH-$OPSYS in - amd64-darwin*) + amd64-darwin*|arm64-darwin*) AC_MSG_NOTICE([Adjusting LDFLAGS to cope with 64bit Darwin]) case $LDFLAGS in *-m64*) |