Makefile: allow $(ARFLAGS) specified from the command line
We can do this because we have a very simple needs and run "ar" exactly the same way everywhere ;-). Requested-by: Jeffrey Walton Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Sep 10, 2015 at 14:27 UTC
ac179b4d9ceb460ca0b6bc77806b54b8e7dc3dd4
1 file changed
+6
-3
Makefile
+6
-3
@@ -351,6 +351,9 @@ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
351
ALL_LDFLAGS = $(LDFLAGS)
352
STRIP ?= strip
353
354
+# Create as necessary, replace existing, make ranlib unneeded.
355
+ARFLAGS = rcs
356
+
357
# Among the variables below, these:
358
# gitexecdir
359
# template_dir
@@ -2068,13 +2071,13 @@ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS
2071
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
2072
2073
$(LIB_FILE): $(LIB_OBJS)
2071
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
2074
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
2075
2076
$(XDIFF_LIB): $(XDIFF_OBJS)
2074
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
2077
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
2078
2079
$(VCSSVN_LIB): $(VCSSVN_OBJS)
2077
- $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $^
2080
+ $(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
2081
2082
export DEFAULT_EDITOR DEFAULT_PAGER
2083