Skip to content

Commit 454d858

Browse files
committed
Support Mac-arm64 target, fixes #218 (#222)
1 parent 4e5ab5b commit 454d858

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ mac-x86:
7171
mac-x86_64:
7272
docker run -it --rm -v $$PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin multiarch/crossbuild make clean-native native OS_NAME=Mac OS_ARCH=x86_64
7373

74+
mac-arm64:
75+
docker run -it --rm -v $$PWD:/src -e TARGET=arm64-apple-darwin mcandre/snek:darwin sh -c "make clean-native native CROSS_PREFIX=arm64-apple-darwin20.4- OS_NAME=Mac OS_ARCH=arm64"
76+
7477
freebsd-x86:
7578
docker run -it --rm -v $$PWD:/workdir empterdose/freebsd-cross-build:9.3 make clean-native native CROSS_PREFIX=i386-freebsd9- OS_NAME=FreeBSD OS_ARCH=x86
7679

Makefile.common

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# os=Default is meant to be generic unix/linux
22

3-
known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-ppc64 Mac-x86 Mac-x86_64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9 HPUX-ia64_32
3+
known_targets := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-ppc64 Mac-x86 Mac-x86_64 Mac-arm64 DragonFly-x86_64 FreeBSD-x86_64 OpenBSD-x86_64 Windows-x86 Windows-x86_64 SunOS-sparcv9 HPUX-ia64_32
44
target := $(OS_NAME)-$(OS_ARCH)
55

66
ifeq (,$(findstring $(strip $(target)),$(known_targets)))
@@ -126,6 +126,14 @@ Mac-x86_64_LINKFLAGS := -dynamiclib
126126
Mac-x86_64_LIBNAME := libjansi.jnilib
127127
Mac-x86_64_JANSI_FLAGS :=
128128

129+
Mac-arm64_CC := $(CROSS_PREFIX)clang -v
130+
Mac-arm64_STRIP := $(CROSS_PREFIX)strip -x
131+
MAC_SDK := /usr/local/osxcross/SDK/MacOSX11.3.sdk/
132+
Mac-arm64_CCFLAGS := -I$(MAC_SDK)/System/Library/Frameworks/JavaVM.framework/Headers -Isrc/main/lib/inc_mac -Os -fPIC -mmacosx-version-min=11.0 -fvisibility=hidden
133+
Mac-arm64_LINKFLAGS := -shared
134+
Mac-arm64_LIBNAME := libjansi.jnilib
135+
Mac-arm64_JANSI_FLAGS :=
136+
129137
Windows-x86_CC := $(CROSS_PREFIX)gcc
130138
Windows-x86_STRIP := $(CROSS_PREFIX)strip
131139
Windows-x86_CCFLAGS := -D_JNI_IMPLEMENTATION_ -Isrc/main/lib/inc_win -Os
Binary file not shown.

0 commit comments

Comments
 (0)