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

 endif
 ifeq ($(ARCH),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
 ifdef CONFIG_UCLIBC
 BCHECK_O=
 endif
+ifeq ($(TARGETOS),Darwin)
+BCHECK_O=
+endif
 ifdef CONFIG_USE_LIBGCC
 LIBTCC1=
 # 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):

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

Keyboard shortcuts