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

Add support for Apple M1 build #382

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 49 additions & 26 deletions src/main/resources/com/github/maven_nar/aol.properties
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,7 @@ x86.Windows.msvc.res.excludes=

x86.Windows.msvc.idl.compiler=midl
x86.Windows.msvc.idl.defines=
x86.Windows.msvc.idl.options=
x86.Windows.msvc.idl.includes=**/*.idl
x86.Windows.msvc.idl.excludes=
x86.Windows.msvc.idl.options=/win32
x86.Windows.msvc.idl.excludes=ia64/* amd64/*

Expand Down Expand Up @@ -891,10 +889,6 @@ x86_64.MacOSX.icc.java.runtimeDirectory=IGNORED

x86_64.MacOSX.icc.lib.prefix=lib
x86_64.MacOSX.icc.shared.prefix=lib
x86_64.MacOSX.icc.static.extension=a
x86_64.MacOSX.icc.shared.extension=dylib
x86_64.MacOSX.icc.plugin.extension=bundle
x86_64.MacOSX.icc.jni.extension=jnilib
x86_64.MacOSX.icc.executable.extension=

# FIXME to be removed when NAR-6
Expand Down Expand Up @@ -931,10 +925,6 @@ x86_64.MacOSX.icpc.java.runtimeDirectory=IGNORED

x86_64.MacOSX.icpc.lib.prefix=lib
x86_64.MacOSX.icpc.shared.prefix=lib
x86_64.MacOSX.icpc.static.extension=a
x86_64.MacOSX.icpc.shared.extension=dylib
x86_64.MacOSX.icpc.plugin.extension=bundle
x86_64.MacOSX.icpc.jni.extension=jnilib
x86_64.MacOSX.icpc.executable.extension=

# FIXME to be removed when NAR-6
Expand Down Expand Up @@ -991,22 +981,22 @@ sparc.SunOS.cc.jni.extension=so

x86.SunOS.linker=g++

x86.SunOS.g++.cpp.compiler=g++
x86.SunOS.g++.cpp.defines=SOLARIS2 GNU_GCC
x86.SunOS.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
x86.SunOS.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
x86.SunOS.g++.cpp.excludes=
x86.SunOS.gpp.cpp.compiler=g++
x86.SunOS.gpp.cpp.defines=SOLARIS2 GNU_GCC
x86.SunOS.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
x86.SunOS.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
x86.SunOS.gpp.cpp.excludes=

x86.SunOS.g++.c.compiler=gcc
x86.SunOS.g++.c.defines=SOLARIS2 GNU_GCC
x86.SunOS.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
x86.SunOS.g++.c.includes=**/*.c
x86.SunOS.g++.c.excludes=
x86.SunOS.gpp.c.compiler=gcc
x86.SunOS.gpp.c.defines=SOLARIS2 GNU_GCC
x86.SunOS.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
x86.SunOS.gpp.c.includes=**/*.c
x86.SunOS.gpp.c.excludes=

x86.SunOS.g++.lib.prefix=lib
x86.SunOS.g++.shared.prefix=lib
x86.SunOS.g++.static.extension=a
x86.SunOS.g++.shared.extension=so
x86.SunOS.gpp.lib.prefix=lib
x86.SunOS.gpp.shared.prefix=lib
x86.SunOS.gpp.static.extension=a
x86.SunOS.gpp.shared.extension=so

## Oracle SPARC 64-bit architecture

Expand Down Expand Up @@ -1084,7 +1074,7 @@ sparc64.SunOS.gpp.executable.extension=
#
# AIX 32/bit
#
ppc.AIX.linker=g++
# ppc.AIX.linker=g++

ppc.AIX.gpp.cpp.compiler=g++
ppc.AIX.gpp.cpp.defines=AIX GNU_GCC f2cFortran
Expand Down Expand Up @@ -1320,8 +1310,8 @@ ppc64.AIX.gcc.shared.extension=a
ppc64.AIX.gcc.plugin.extension=a
ppc64.AIX.gcc.jni.extension=a
ppc64.AIX.gcc.executable.extension=
#

#
# loongarch64 Linux
#
loongarch64.Linux.linker=g++
Expand Down Expand Up @@ -1356,3 +1346,36 @@ loongarch64.Linux.gpp.plugin.extension=so
loongarch64.Linux.gpp.jni.extension=so
loongarch64.Linux.gpp.executable.extension=

#
# MacOSX ("Mac OS X" => MacOSX) Apple Silicon M1 (64 bits)
#
aarch64.MacOSX.linker=g++

aarch64.MacOSX.gpp.cpp.compiler=g++
aarch64.MacOSX.gpp.cpp.defines=Darwin GNU_GCC
aarch64.MacOSX.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
aarch64.MacOSX.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
aarch64.MacOSX.gpp.cpp.excludes=

aarch64.MacOSX.gpp.c.compiler=gcc
aarch64.MacOSX.gpp.c.defines=Darwin GNU_GCC
aarch64.MacOSX.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
aarch64.MacOSX.gpp.c.includes=**/*.c
aarch64.MacOSX.gpp.c.excludes=

aarch64.MacOSX.gpp.fortran.compiler=gfortran
aarch64.MacOSX.gpp.fortran.defines=Darwin GNU_GCC
aarch64.MacOSX.gpp.fortran.options=-Wall -fno-automatic -fno-second-underscore
aarch64.MacOSX.gpp.fortran.includes=**/*.f **/*.for
aarch64.MacOSX.gpp.fortran.excludes=

aarch64.MacOSX.gpp.java.include=include
aarch64.MacOSX.gpp.java.runtimeDirectory=IGNORED

aarch64.MacOSX.gpp.lib.prefix=lib
aarch64.MacOSX.gpp.shared.prefix=lib
aarch64.MacOSX.gpp.static.extension=a
aarch64.MacOSX.gpp.shared.extension=dylib
aarch64.MacOSX.gpp.plugin.extension=bundle
aarch64.MacOSX.gpp.jni.extension=jnilib
aarch64.MacOSX.gpp.executable.extension=