1
0
mirror of https://github.com/Interlisp/maiko.git synced 2026-01-25 19:46:21 +00:00

Add extra arg to makeright to allow choice of arm64 or x64 on Darwin (MacOS) platform. Enables cross-compiles bertween x64 and arm64 Macs.

This commit is contained in:
Frank Halasz
2023-02-18 22:44:26 -08:00
committed by Frank Halasz
parent 2e893a75ab
commit e074699beb
3 changed files with 25 additions and 3 deletions

View File

@@ -1,6 +1,6 @@
# Options for MacOS, x86 processor, X windows
# Options for MacOS, arm64 (aka aarch64) processor, X windows
CC = clang $(CLANG_CFLAGS)
CC = clang -target arm64-apple-darwin13 $(CLANG_CFLAGS)
XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \

View File

@@ -1,6 +1,6 @@
# Options for MacOS, x86 processor, X windows
CC = clang -m64 $(CLANG_CFLAGS)
CC = clang -target x86_64-apple-darwin13 $(CLANG_CFLAGS)
XFILES = $(OBJECTDIR)xmkicon.o \
$(OBJECTDIR)xbbt.o \
@@ -26,3 +26,4 @@ LDELDFLAGS = -L/opt/X11/lib -lX11 -lm
OBJECTDIR = ../$(RELEASENAME)/
default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldex

View File

@@ -54,9 +54,30 @@ if test $# -gt 0
shift
fi
target_arch="$1"
if test $# -gt 0
then
shift
fi
architecture=`machinetype`
osversion=`osversion`
if test "$osversion" != "darwin"
then
echo "WARNING: target architecture applies only to the Darwin (MacOS) platform":
echo "Ignoring target architecture argument: $target"
elif test "$target_arch" = "x86_64"
then
architecure=$target_arch
elif test "$target_arch" = "aarch64"
then
architecure=$target_arch
fi
echo "making so far for ${osversion} on ${architecture}."
case "$display" in
init) display=single
releasename=init-${osversion}.${architecture}