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 149647ba28f9800b1bebe992991900b75ec9695a..3081a92680316a3227fa60f6145c8d059c2bc995 100644 (file)
--- 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 9b6d8201f5d887a3e2c7b01f744328420bbe090e..12b994963ca340d124058e6fcf81a746d5e6bb9d 100644 (file)
--- 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}