"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

@@ -137,7 +137,7 @@ LIBTCC1=libtcc1.a · 136 unmodified lines
137	else ifeq ($(ARCH),i386)	137	else ifeq ($(ARCH),i386)
138	NATIVE_FILES=$(I386_FILES)	138	NATIVE_FILES=$(I386_FILES)
139	PROGS_CROSS=$($(X64_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)	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	LIBTCC1=libtcc1.a	141	LIBTCC1=libtcc1.a
142	else ifeq ($(ARCH),x86-64)	142	else ifeq ($(ARCH),x86-64)
143	NATIVE_FILES=$(X86_64_FILES)	143	NATIVE_FILES=$(X86_64_FILES)

  BCHECK_O =
 endif
-ifdef XAR
+XAR ?= $(AR)
-AR = $(XAR)
-endif
 $(DIR)/libtcc1.a ../libtcc1.a : $(OBJ) $(XAR)
-	$(AR) rcs $@ $(OBJ)
+	$(XAR) rcs $@ $(OBJ)
 $(DIR)/%.o : %.c
 	$(XCC) -c $< -o $@ $(XFLAGS)
 $(DIR)/%.o : %.S

Keyboard shortcuts