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.

Milutin Jovanovic committed 14 years ago

Commit 6e13c351 parent 8ca8b082 files · +9 −4Browse files

Unified · Split

2 files

@@ -36,10 +36,12 @@ endif · 35 unmodified lines
36	36	endif
37	37
38	38	ifeq ($(ARCH),i386)
39		−NATIVE_DEFINES=-DTCC_TARGET_I386
	39	+NATIVE_DEFINES=-DTCC_TARGET_I386
	40	+CFLAGS+=-m32
40	41	else
41	42	ifeq ($(ARCH),x86-64)
42	43	NATIVE_DEFINES=-DTCC_TARGET_X86_64
	44	+CFLAGS+=-m64
43	45	NATIVE_DEFINES+=$(if $(wildcard /lib64/ld-linux-x86-64.so.2),-DTCC_TARGET_X86_64_CENTOS)
44	46	endif
45	47	endif
@@ -140,6 +142,9 @@ endif · 94 unmodified lines
140	142	ifdef CONFIG_UCLIBC
141	143	BCHECK_O=
142	144	endif
	145	+ifeq ($(TARGETOS),Darwin)
	146	+BCHECK_O=
	147	+endif
143	148
144	149	ifdef CONFIG_USE_LIBGCC
145	150	LIBTCC1=
@@ -157,7 +162,7 @@ all: $(PROGS) $(TCCLIBS) $(TCCDOCS) · 11 unmodified lines
157	162
158	163	# Host Tiny C Compiler
159	164	tcc$(EXESUF): tcc.o $(LIBTCC)
160		− $(CC) -o $@ $^ $(LIBS) $(LDFLAGS) $(LINK_LIBTCC)
	165	+ $(CC) -o $@ $^ $(LIBS) $(CFLAGS) $(LDFLAGS) $(LINK_LIBTCC)
161	166
162	167	# Cross Tiny C Compilers
163	168	%-tcc$(EXESUF):

@@ -14,11 +14,11 @@ ifndef TARGET · 13 unmodified lines
14	14	else
15	15	ifeq ($(ARCH),i386)
16	16	TARGET = i386
17		− XCC = gcc -O2
	17	+ XCC = gcc -O2 -m32
18	18	else
19	19	ifeq ($(ARCH),x86-64)
20	20	TARGET = x86_64
21		− XCC = gcc -O2
	21	+ XCC = gcc -O2 -m64
22	22	endif
23	23	endif
24	24	endif

Keyboard shortcuts