makefile: Fix macosx target.

diff --git a/GNUmakefile b/GNUmakefile
index c549b786599d4193c700a3b80906f5b4cc78ce11..8f1548cec49a65d677c7fe88d8636d43f306bda3 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -191,6 +191,9 @@ macosx-x86-fat:
 macosx-arm64:
        $(MAKE) $(ALL) macosx.app CONFIG=vm/Config.macosx.arm64
 
+linux-arm-32:
+       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.32
+
 linux-arm-64:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm.64
 
@@ -206,9 +209,6 @@ linux-ppc-32:
 linux-ppc-64:
        $(MAKE) $(ALL) CONFIG=vm/Config.linux.ppc.64
 
-linux-arm:
-       $(MAKE) $(ALL) CONFIG=vm/Config.linux.arm
-
 windows-x86-32:
        $(MAKE) $(ALL) CONFIG=vm/Config.windows.x86.32
        $(MAKE) factor-console CONFIG=vm/Config.windows.x86.32
@@ -276,3 +276,4 @@ clean:
        rm -f Factor.app/Contents/Frameworks/libfactor.dylib
 
 .PHONY: factor factor-lib factor-console factor-ffi-test tags clean macosx.app
+.PHONY: linux-x86-32 linux-x86-64 linux-ppc-32 linux-ppc-64 linux-arm-64 freebsd-x86-32 freebsd-x86-64 macosx-x86-32 macosx-x86-64 macosx-x86-fat macosx-arm64 windows-x86-32 windows-x86-64

diff --git a/build.sh b/build.sh
index 421132603896fb62df4ea83e325812151c1219af..a260eecb20c06475df28d832c4bd59c7a84c1a4e 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -301,6 +301,7 @@ find_architecture() {
        ppc64) ARCH=ppc;;
        *86) ARCH=x86;;
        *86_64) ARCH=x86;;
+       arm64) ARCH=arm64;;
        aarch64) ARCH=arm64;;
        iPhone5*[3-9]) ARCH=arm64;;
        iPhone[6-9]*) ARCH=arm64;;
@@ -440,6 +441,9 @@ set_build_info() {
     elif [[ $OS == linux && $ARCH == arm64 ]] ; then
         MAKE_IMAGE_TARGET=unix-arm.64
         MAKE_TARGET=linux-arm-64
+    elif [[ $OS == macosx && $ARCH == arm64 ]] ; then
+        MAKE_IMAGE_TARGET=unix-arm.64
+        MAKE_TARGET=macosx-arm64
     elif [[ $OS == windows && $ARCH == x86 && $WORD == 64 ]] ; then
         MAKE_IMAGE_TARGET=windows-x86.64
         MAKE_TARGET=windows-x86-64