From 2849da50f1ff94c958947e63a8cdb6fbb5f98edd Mon Sep 17 00:00:00 2001
From: maz-1 <ohmygod19993@gmail.com>
Date: Thu, 1 Jul 2021 16:11:44 +0800
Subject: [PATCH] macos: replace i386 with arm64e in fat binary option

---
 Makefile  | 4 ++--
 configure | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 7f3f4fa..33c2142 100644
--- a/Makefile
+++ b/Makefile
@@ -92,10 +92,10 @@ $(LDSO_PATHNAME): $(LOBJS)
 		-shared -o $@ $^ $(SOCKET_LIBS)
 
 $(PXCHAINS): $(OBJS)
-	$(CC) $^ $(USER_LDFLAGS) $(LIBDL) -o $@
+	$(CC) $^ $(LDFLAGS) $(USER_LDFLAGS) $(LIBDL) -o $@
 
 $(PXCHAINS_D): $(DOBJS)
-	$(CC) $^ $(USER_LDFLAGS) -o $@
+	$(CC) $^ $(LDFLAGS) $(USER_LDFLAGS) -o $@
 
 
 .PHONY: all clean install install-config install-libs install-tools
diff --git a/configure b/configure
index 8b21b97..d72c5cc 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ usage() {
 	echo "--ignore-cve              default: no"
 	echo "	if set to yes ignores CVE-2015-3887 and makes it possible"
 	echo "	to preload from current dir (insecure)"
-	echo "--fat-binary : build for both i386 and x86_64 architectures on 64-bit Macs"
+	echo "--fat-binary : build for both arm64e and x86_64 architectures on 64-bit Macs"
 	echo "--help : show this text"
 	exit 1
 }
@@ -225,9 +225,9 @@ if ismac ; then
 	echo LDSO_SUFFIX=dylib>>config.mak
 	echo MAC_CFLAGS+=-DIS_MAC=1>>config.mak
 	if ismac64 && [ "$fat_binary" = 1 ] ; then
-		echo "Configuring a fat binary for i386 and x86_64"
-		echo MAC_CFLAGS+=-arch i386 -arch x86_64>>config.mak
-		echo LDFLAGS+=-arch i386 -arch x86_64>>config.mak
+		echo "Configuring a fat binary for arm64e and x86_64"
+		echo MAC_CFLAGS+=-arch arm64e -arch x86_64>>config.mak
+		echo LDFLAGS+=-arch arm64e -arch x86_64>>config.mak
 	fi
 elif isbsd ; then
 	echo LIBDL=>>config.mak