Only built Mac intel universal binary on an intel machine.

diff --git a/mkpkg b/mkpkg
index 7a4e8b84419c46f5582b6010664d17c269d6bd49..7cbaf70690d16887b2353c03701581c02d45b26c 100755 (executable)
--- 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}"