From: James Zern <jzern@google.com>
Date: Thu, 10 Sep 2015 19:54:01 +0000 (-0700)
Subject: build: modify default ARFLAGS / .a target
X-Git-Tag: v1.5.0~173^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b3d77536626515f9040b8646cbf72daf9a59747;p=libvpx

build: modify default ARFLAGS / .a target

remove 'u' and specify all objects to allow objects with the same
basename to be added and a incremental rebuild to succeed

fixes issue #1067

Change-Id: Id0ebc89be826a026f1bbf21b4e32a2b1af45154d
---

diff --git a/build/make/Makefile b/build/make/Makefile
index 149647ba2..3081a9268 100644
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -287,7 +287,7 @@ define archive_template
 # for creating them.
 $(1):
 	$(if $(quiet),@echo "    [AR] $$@")
-	$(qexec)$$(AR) $$(ARFLAGS) $$@ $$?
+	$(qexec)$$(AR) $$(ARFLAGS) $$@ $$^
 endef
 
 define so_template
diff --git a/build/make/configure.sh b/build/make/configure.sh
index 9b6d8201f..12b994963 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -428,7 +428,7 @@ NM=${NM}
 
 CFLAGS  = ${CFLAGS}
 CXXFLAGS  = ${CXXFLAGS}
-ARFLAGS = -rus\$(if \$(quiet),c,v)
+ARFLAGS = -crs\$(if \$(quiet),,v)
 LDFLAGS = ${LDFLAGS}
 ASFLAGS = ${ASFLAGS}
 extralibs = ${extralibs}