From 6e13c35334200e7ef918308aeb820404d7b35283 Mon Sep 17 00:00:00 2001
From: Milutin Jovanovic <jovanovic.milutin@gmail.com>
Date: Thu, 16 Feb 2012 11:24:14 -0500
Subject: [PATCH] Attempt to fix 32 bit OSX build. The fix consists of adding
 -m32 and -m64 to the appropriate CFLAGS. In addition, memory hooks are very
 different on OSX, so build of bcheck.c had to be disabled for now.

Change of the CFLAGS does affect builds on other platforms, and this needs
to be tested.
---
 Makefile     | 9 +++++++--
 lib/Makefile | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index fd8602e9..ab9a698c 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,12 @@ endif
 endif
 
 ifeq ($(ARCH),i386)
-NATIVE_DEFINES=-DTCC_TARGET_I386
+NATIVE_DEFINES=-DTCC_TARGET_I386 
+CFLAGS+=-m32
 else
 ifeq ($(ARCH),x86-64)
 NATIVE_DEFINES=-DTCC_TARGET_X86_64
+CFLAGS+=-m64
 NATIVE_DEFINES+=$(if $(wildcard /lib64/ld-linux-x86-64.so.2),-DTCC_TARGET_X86_64_CENTOS)
 endif
 endif
@@ -140,6 +142,9 @@ endif
 ifdef CONFIG_UCLIBC
 BCHECK_O=
 endif
+ifeq ($(TARGETOS),Darwin)
+BCHECK_O=
+endif
 
 ifdef CONFIG_USE_LIBGCC
 LIBTCC1=
@@ -157,7 +162,7 @@ all: $(PROGS) $(TCCLIBS) $(TCCDOCS)
 
 # Host Tiny C Compiler
 tcc$(EXESUF): tcc.o $(LIBTCC)
-	$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) $(LINK_LIBTCC)
+	$(CC) -o $@ $^ $(LIBS) $(CFLAGS) $(LDFLAGS) $(LINK_LIBTCC)
 
 # Cross Tiny C Compilers
 %-tcc$(EXESUF):
diff --git a/lib/Makefile b/lib/Makefile
index 071c49ff..b14f8b53 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -14,11 +14,11 @@ ifndef TARGET
  else
  ifeq ($(ARCH),i386)
   TARGET = i386
-  XCC = gcc -O2
+  XCC = gcc -O2 -m32
  else
  ifeq ($(ARCH),x86-64)
   TARGET = x86_64
-  XCC = gcc -O2
+  XCC = gcc -O2 -m64
  endif
  endif
  endif