summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:25 -0700
commit5586bd2de231a6b504162107a65c2de6ea7959d2 (patch)
treeab26f9b2956cebf384a86484e98bd22e75d2fe66 /Makefile
parentMerge branch 'ti/tcsh-completion-regression-fix' into maint (diff)
parentMakefile: remove archives before manipulating them with 'ar' (diff)
downloadtgif-5586bd2de231a6b504162107a65c2de6ea7959d2.tar.xz
Merge branch 'sg/make-fix-ar-invocation' into maint
Build fix. * sg/make-fix-ar-invocation: Makefile: remove archives before manipulating them with 'ar'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9573190f1d..a98e298123 100644
--- a/Makefile
+++ b/Makefile
@@ -2603,10 +2603,10 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
$(LIB_FILE): $(LIB_OBJS)
- $(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
$(XDIFF_LIB): $(XDIFF_OBJS)
- $(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
export DEFAULT_EDITOR DEFAULT_PAGER