# HG changeset patch
# User cannam
# Date 1276091453 0
# Node ID 250c7aaff287e1ba72d4b0f81fe000c0afb69770
# Parent  bdfc949cd9ed5481a20131a080223730cb4b88aa
* Change arch defaults to as to use universal binaries (we have to change
  them somehow, because the default is now 64-bit which breaks 32-bit hosts)

diff -r bdfc949cd9ed -r 250c7aaff287 build/Makefile.osx
--- a/build/Makefile.osx	Fri May 21 12:54:56 2010 +0000
+++ b/build/Makefile.osx	Wed Jun 09 13:50:53 2010 +0000
@@ -60,18 +60,24 @@
 
 # Architecture and developer SDK selection flags.  Define this only
 # if you want to select a different OS/X compatibility level from the
-# default, for example in order to build universal binaries.
+# default (which is to target 10.4 or newer and build universal binaries).
 #
-#ARCHFLAGS	= -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+SDKFLAGS	= -isysroot /Developer/SDKs/MacOSX10.4u.sdk 
+ARCHFLAGS	= $(SDKFLAGS) -arch i386 -arch x86_64 -arch ppc
 
 # Compile flags
 #
 CXXFLAGS	= $(ARCHFLAGS) -O2 -Wall -I. -fPIC
 
+# Link flags common to all link targets
+#
+LDFLAGS		= $(ARCHFLAGS) 
+
 # ar, ranlib
 #
 AR		= ar
 RANLIB		= ranlib
+RM_F		= rm -f
 
 # Libraries required for the plugins.
 #
@@ -215,9 +221,11 @@
 all:		sdk plugins host rdfgen test
 
 $(SDK_STATIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)
+		$(RM_F) $@
 		$(AR) r $@ $(SDK_OBJECTS)
 
 $(HOSTSDK_STATIC):	$(HOSTSDK_OBJECTS) $(API_HEADERS) $(HOSTSDK_HEADERS)
+		$(RM_F) $@
 		$(AR) r $@ $(HOSTSDK_OBJECTS)
 
 $(SDK_DYNAMIC):	$(SDK_OBJECTS) $(API_HEADERS) $(SDK_HEADERS)