From 5bbd2294e9ba74462b940e9ef2f879c0ce4ef8a7 Mon Sep 17 00:00:00 2001
From: Sriram Raman <sriramkraman@google.com>
Date: Wed, 7 Oct 2009 16:27:38 -0700
Subject: [PATCH] For Ying Wang:

Fix "argument list too long" build error bug.
---
 core/combo/darwin-x86.mk | 1 +
 core/combo/select.mk     | 2 +-
 core/definitions.mk      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/combo/darwin-x86.mk b/core/combo/darwin-x86.mk
index 21509609b..65d6375ab 100644
--- a/core/combo/darwin-x86.mk
+++ b/core/combo/darwin-x86.mk
@@ -14,6 +14,7 @@ $(combo_target)JNILIB_SUFFIX := .jnilib
 $(combo_target)GLOBAL_CFLAGS += \
 	-include $(call select-android-config-h,darwin-x86)
 $(combo_target)RUN_RANLIB_AFTER_COPYING := true
+$(combo_target)GLOBAL_ARFLAGS := cqs
 
 ifeq ($(combo_target),TARGET_)
 $(combo_target)CUSTOM_LD_COMMAND := true
diff --git a/core/combo/select.mk b/core/combo/select.mk
index 793b0a9dc..ccdf1fbf8 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -40,7 +40,7 @@ $(combo_target)HAVE_KERNEL_MODULES := 0
 $(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar
 $(combo_target)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
 $(combo_target)GLOBAL_LDFLAGS :=
-$(combo_target)GLOBAL_ARFLAGS := crs
+$(combo_target)GLOBAL_ARFLAGS := crsP
 
 $(combo_target)EXECUTABLE_SUFFIX := 
 $(combo_target)SHLIB_SUFFIX := .so
diff --git a/core/definitions.mk b/core/definitions.mk
index 297e6b7ae..fe6132815 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -931,7 +931,7 @@ define transform-o-to-static-lib
 @rm -f $@
 $(extract-and-include-whole-static-libs)
 @echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
-$(hide) $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^
+$(hide) echo $^ | xargs $(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
 endef
 
 ###########################################################
@@ -944,7 +944,7 @@ define transform-host-o-to-static-lib
 @mkdir -p $(dir $@)
 @echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
 @rm -f $@
-$(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $^
+echo $^ | xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
 endef