Build programs 32-bit only on Mac OS X.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6562 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makedefs.in b/Makedefs.in
index c93143be97d5a460014671642eafec36a2c4ce6c..e55d8466c805db82f316ad3311327932ee14a33c 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -133,7 +133,7 @@ DNSSDLIBS   =       @DNSSDLIBS@
 IMGLIBS                =       @IMGLIBS@
 IMGFILTERS     =       @IMGFILTERS@
 LAUNCHDLIBS    =       @LAUNCHDLIBS@
-LDFLAGS                =       -L../cups -L../filter $(ARCHFLAGS) \
+LDFLAGS                =       -L../cups -L../filter @LDARCHFLAGS@ \
                        @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
 LEGACY_BACKENDS        =       @LEGACY_BACKENDS@
 LINKCUPS       =       @LINKCUPS@ $(SSLLIBS)

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index d39ddf8b3242bd3a00dbaa473e1e98046003b262..6e0b31eeca18155c756c1ca68b8fda00e841197a 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -39,11 +39,20 @@ AC_ARG_WITH(archflags, [  --with-archflags="flags"
 
 if test -z "$with_archflags"; then
        ARCHFLAGS=""
+       LDARCHFLAGS=""
 else
        ARCHFLAGS="$with_archflags"
+       if test "$uname" = Darwin; then
+               # Only link 32-bit programs - 64-bit is for the shared
+               # libraries...
+               LDARCHFLAGS="`echo $ARCHFLAGS | sed -e '1,$s/-arch x86_64//' -e '1,$s/-arch ppc64//'`"
+       else
+               LDARCHFLAGS="$ARCHFLAGS"
+       fi
 fi
 
 AC_SUBST(ARCHFLAGS)
+AC_SUBST(LDARCHFLAGS)
 
 dnl Setup support for separate 32/64-bit library generation...
 AC_ARG_WITH(arch32flags, [  --with-arch32flags="flags"