From c19ec8f9f63865f7d1fa220caf1922704b8349b1 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Fri, 20 Apr 2012 10:38:43 -0400
Subject: [PATCH] Only built Mac intel universal binary on an intel machine.

---
 mkpkg | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mkpkg b/mkpkg
index 7a4e8b844..7cbaf7069 100755
--- a/mkpkg
+++ b/mkpkg
@@ -227,8 +227,12 @@ case "$osversion" in
 		$configure_opts"
 	;;
     macos*)
-	# Build universal binaries (intel-only) targetting Mac OS X 10.5
-	ARCH_FLAGS="-arch i386 -arch x86_64"
+	case "$osversion" in
+	    *i386|*x86_64)
+		# Build intel-only universal binaries
+		ARCH_FLAGS="-arch i386 -arch x86_64"
+		;;
+	esac
 	if test "${osversion}" != "`$top_srcdir/pp --probe`"; then
 	    sdkvers=`echo "${osversion}" | sed 's/^macos\([0-9][0-9]\)\([0-9]*\)-.*$/\1.\2/'`
 	    SDK_FLAGS="-isysroot /Developer/SDKs/MacOSX${sdkvers}.sdk -mmacosx-version-min=${sdkvers}"
-- 
2.40.0