Merge branch 'jc/cache-tree' into next

diff --git a/Makefile b/Makefile
index 7ca38554acdbecd2571fabe61b94f34fd009aa20..9bf6c809750cd681bfea122aa694f2a968253821 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -580,7 +580,7 @@ $(LIB_FILE): $(LIB_OBJS)
 XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o
 
 $(XDIFF_LIB): $(XDIFF_OBJS)
-       $(AR) rcs $@ $(XDIFF_OBJS)
+       rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
 
 
 doc: