From d4cae8f15e06c08b6a2c9a3f0cd2d1498735c3dd Mon Sep 17 00:00:00 2001
From: Matt Klich <matt.klich@readytalk.com>
Date: Fri, 5 Feb 2010 16:40:48 -0700
Subject: [PATCH] Fixed darwin build.

---
 makefile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/makefile b/makefile
index e94af11502..27beeb62ab 100644
--- a/makefile
+++ b/makefile
@@ -77,14 +77,19 @@ input = List
 build-cxx = g++
 build-cc = gcc
 
-ifeq ($(arch),i386)
-  cxx = $(build-cxx) -m32
-  cc = $(build-cc) -m32
-endif
-ifeq ($(arch),x86_64)
-  cxx = $(build-cxx) -m64
-  cc = $(build-cc) -m64
+cxx = $(build-cxx)
+cc = $(build-cc)
+ifneq ($(platform),darwin)
+       ifeq ($(arch),i386)
+               cxx = $(cxx) -m32
+               cc = $(cc) -m32
+       endif
+       ifeq ($(arch),x86_64)
+               cxx = $(cxx) -m64
+               cc = $(cc) -m64
+       endif
 endif
+
 ar = ar
 ranlib = ranlib
 dlltool = dlltool