aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilutin Jovanovic <jovanovic.milutin@gmail.com>2012-02-16 11:24:14 -0500
committerMilutin Jovanovic <jovanovic.milutin@gmail.com>2012-02-16 11:24:14 -0500
commit6e13c35334200e7ef918308aeb820404d7b35283 (patch)
treeed2b53bf44a284486685397ad459d737c10241af
parent8ca8b08890c220a9e238c711aef96b49727e80f0 (diff)
downloadtinycc-6e13c35334200e7ef918308aeb820404d7b35283.tar.gz
tinycc-6e13c35334200e7ef918308aeb820404d7b35283.tar.bz2
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.
-rw-r--r--Makefile9
-rw-r--r--lib/Makefile4
2 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index fd8602e..ab9a698 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 071c49f..b14f8b5 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