From c14bf58cd7421d712eef63715046bf058d0aee69 Mon Sep 17 00:00:00 2001
From: Adam Hamsik <adam.hamsik@chillisys.com>
Date: Mon, 18 Jun 2012 15:45:45 +0200
Subject: [PATCH] Add support for both i386 and amd64 in mac os x binary.

---
 Makefile  | 2 ++
 configure | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 33546b0..cf40412 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ ALL_TOOLS = $(PXCHAINS)
 
 
 CCFLAGS+=$(USER_CFLAGS) $(MAC_CFLAGS)
+LDFLAGS+=$(USER_LDFLAGS) $(MAC_LDFLAGS)
+CXXFLAGS+=$(CCFLAGS) $(USER_CFLAGS) $(MAC_CFLAGS)
 CFLAGS_MAIN=-DLIB_DIR=\"$(libdir)\" -DINSTALL_PREFIX=\"$(prefix)\" -DDLL_NAME=\"$(LDSO_PATHNAME)\"
 
 
diff --git a/configure b/configure
index 35d2148..63728e3 100755
--- a/configure
+++ b/configure
@@ -61,6 +61,7 @@ echo includedir=$includedir>>config.mak
 if ismac ; then
 	echo LDSO_SUFFIX=dylib>>config.mak
 	echo MAC_CFLAGS+=-DIS_MAC=1 -arch x86_64 -arch i386 >>config.mak
+	echo MAC_LDFLAGS+=-arch x86_64 -arch i386 >>config.mak
 	echo LD_SET_SONAME=-Wl,-install_name,>>config.mak
 	echo INSTALL_FLAGS=-m>>config.mak
 fi