Ticket #21222: patch-universal-flags.diff

configure.in

@@ -69 +69 @@
 AC_SUBST(CONFIG_ARGS)
 CONFIG_ARGS="$ac_configure_args"
 
+AC_MSG_CHECKING(for --with-universal-arch-flags)
+AC_ARG_WITH(universal-arch-flags,
+        AC_HELP_STRING(--with-universal-arch-flags=FLAGS, 
+                directly select architectures to build on Mac OS),
+[
+        AC_MSG_RESULT($withval)
+        UNIVERSAL_ARCH_FLAGS="$withval"
+],[
+        AC_MSG_RESULT(None) ])
+AC_SUBST(UNIVERSAL_ARCH_FLAGS)
+
 AC_ARG_ENABLE(universalsdk,
         AC_HELP_STRING(--enable-universalsdk@<:@=SDKDIR@:>@, Build against Mac OS X 10.4u SDK (ppc/i386)),
 [
@@ -869 +880 @@
 
 AC_SUBST(BASECFLAGS)
 
-# The -arch flags for universal builds on OSX
-UNIVERSAL_ARCH_FLAGS=
-AC_SUBST(UNIVERSAL_ARCH_FLAGS)
 
 # tweak BASECFLAGS based on compiler and platform
 case $GCC in
@@ -913 +921 @@
 
 
             if test "${enable_universalsdk}"; then
-                UNIVERSAL_ARCH_FLAGS=""
+                if test ! "${UNIVERSAL_ARCH_FLAGS}"; then
                 if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
                    UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
                    ARCH_RUN_32BIT=""
@@ -930 +938 @@
                    AC_MSG_ERROR([proper usage is --with-universalarch=32-bit|64-bit|all])
 
                  fi
+                 fi
 
 
                 BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"