diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-12 20:51:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-12 20:51:25 (GMT) |
| commit | 5586bd2de231a6b504162107a65c2de6ea7959d2 (patch) | |
| tree | ab26f9b2956cebf384a86484e98bd22e75d2fe66 /Makefile | |
| parent | 4e408f1060bc677a7d6f17d349f05203ef4b76f3 (diff) | |
| parent | 325b06deda688e5110a134a4f8d390ed48af7b80 (diff) | |
| download | git-5586bd2de231a6b504162107a65c2de6ea7959d2.zip git-5586bd2de231a6b504162107a65c2de6ea7959d2.tar.gz git-5586bd2de231a6b504162107a65c2de6ea7959d2.tar.bz2 | |
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-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |