Skip to content

Commit d868e4d

Browse files
committed
Merge branch 'sg/make-fix-ar-invocation'
Build fix. * sg/make-fix-ar-invocation: Makefile: remove archives before manipulating them with 'ar'
2 parents 4c3bddb + 325b06d commit d868e4d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2607,10 +2607,10 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
26072607
$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
26082608

26092609
$(LIB_FILE): $(LIB_OBJS)
2610-
$(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
2610+
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
26112611

26122612
$(XDIFF_LIB): $(XDIFF_OBJS)
2613-
$(QUIET_AR)$(AR) $(ARFLAGS) $@ $^
2613+
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
26142614

26152615
export DEFAULT_EDITOR DEFAULT_PAGER
26162616

0 commit comments

Comments
 (0)