commit 259b2741bbf6a0687f462d4016b350b4b9f4af30
author Yi Kong <yikong@google.com> Mon Jan 08 19:51:19 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 08 19:51:19 2018 +0000
tree 857fd4727b600108da1017944b26a19ec67059c0
parent e3692095a1f201071fc50f5940094388bac81846
parent 4f2e0334474788b20d464f1cdbacf421fb0548f8

Merge "Revert "Switch to llvm-ar""

core/aux_config.mk

diff --git a/core/aux_config.mk b/core/aux_config.mk
index 41c14ae..c40b8cc 100644
--- a/core/aux_config.mk
+++ b/core/aux_config.mk
@@ -32,7 +32,7 @@
 
 # setup AUX globals
 AUX_SHLIB_SUFFIX := .so
-AUX_GLOBAL_ARFLAGS := cqsD
+AUX_GLOBAL_ARFLAGS := crsPD
 AUX_STATIC_LIB_SUFFIX := .a
 
 # Load ever-lasting "indexed" version of AUX variant environment; it is treated as READ-ONLY from this

core/combo/select.mk

diff --git a/core/combo/select.mk b/core/combo/select.mk
index 94e37c6..5e181b9 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -28,7 +28,7 @@
 
 # Set reasonable defaults for the various variables
 
-$(combo_var_prefix)GLOBAL_ARFLAGS := cqsD
+$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD
 
 $(combo_var_prefix)STATIC_LIB_SUFFIX := .a