diff --git a/Makefile b/Makefile
index cf3010c..0f624f2 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,7 @@ LIBTCC1=libtcc1.a
 else ifeq ($(ARCH),i386)
 NATIVE_FILES=$(I386_FILES)
 PROGS_CROSS=$($(X64_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
-LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a
+LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/x86_64/libtcc1.a
 LIBTCC1=libtcc1.a
 else ifeq ($(ARCH),x86-64)
 NATIVE_FILES=$(X86_64_FILES)
diff --git a/lib/Makefile b/lib/Makefile
index 505ec23..d715ef6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -108,12 +108,10 @@ ifeq ($(TARGETOS),Darwin)
  BCHECK_O =
 endif
 
-ifdef XAR
-AR = $(XAR)
-endif
+XAR ?= $(AR)
 
 $(DIR)/libtcc1.a ../libtcc1.a : $(OBJ) $(XAR)
-	$(AR) rcs $@ $(OBJ)
+	$(XAR) rcs $@ $(OBJ)
 $(DIR)/%.o : %.c
 	$(XCC) -c $< -o $@ $(XFLAGS)
 $(DIR)/%.o : %.S