"configure --enable-cross" on x86: build a libtcc1.a for x86_64

seyko committed 11 years ago

Commit 3dba9cc1 parent e2650602 files · +3 −5Browse files

Unified · Split

2 files

Makefile +1 −1
lib/Makefile +2 −4

@@ -137,7 +137,7 @@ LIBTCC1=libtcc1.a · 136 unmodified lines
137	137	else ifeq ($(ARCH),i386)
138	138	NATIVE_FILES=$(I386_FILES)
139	139	PROGS_CROSS=$($(X64_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
140		−LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a
	140	+LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/x86_64/libtcc1.a
141	141	LIBTCC1=libtcc1.a
142	142	else ifeq ($(ARCH),x86-64)
143	143	NATIVE_FILES=$(X86_64_FILES)

lib/Makefile+2−4

@@ -108,12 +108,10 @@ ifeq ($(TARGETOS),Darwin) · 107 unmodified lines
108	108	BCHECK_O =
109	109	endif
110	110
111		−ifdef XAR
112		−AR = $(XAR)
113		−endif
	111	+XAR ?= $(AR)
114	112
115	113	$(DIR)/libtcc1.a ../libtcc1.a : $(OBJ) $(XAR)
116		− $(AR) rcs $@ $(OBJ)
	114	+ $(XAR) rcs $@ $(OBJ)
117	115	$(DIR)/%.o : %.c
118	116	$(XCC) -c $< -o $@ $(XFLAGS)
119	117	$(DIR)/%.o : %.S