diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-09-03 13:49:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-03 13:49:30 -0700 |
| commit | d868e4d9ee5c91e9fb9b771950c99ebdd49a8e1e (patch) | |
| tree | 8b059d034431403a92a038f59c46c3e74f2e8421 /Makefile | |
| parent | Merge branch 'ti/tcsh-completion-regression-fix' (diff) | |
| parent | Makefile: remove archives before manipulating them with 'ar' (diff) | |
| download | tgif-d868e4d9ee5c91e9fb9b771950c99ebdd49a8e1e.tar.xz | |
Merge branch 'sg/make-fix-ar-invocation'
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
@@ -2607,10 +2607,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 |