From 3f5b7864df62674298e5c8cd2a5061f2af75ac03 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Wed, 30 Jan 2013 15:03:11 -0600
Subject: Remove workarounds for cross-compiling.  Search for ar and ranlib.

Use the methods that autoconf gives us to find ar/ranlib, rather than trying to
guess based on the compiler used.
---
 build/cc-auto.mak.in | 1 +
 build/rules.mak      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/cc-auto.mak.in b/build/cc-auto.mak.in
index bc56567..2530e21 100644
--- a/build/cc-auto.mak.in
+++ b/build/cc-auto.mak.in
@@ -1,6 +1,7 @@
 export CC = @CC@ -c
 export CXX = @CXX@ -c
 export AR = @AR@
+export AR_FLAGS = @AR_FLAGS@
 export LD = @LD@
 export LDOUT = -o 
 export RANLIB = @RANLIB@
diff --git a/build/rules.mak b/build/rules.mak
index 0d35c56..15ae667 100644
--- a/build/rules.mak
+++ b/build/rules.mak
@@ -72,6 +72,7 @@ print_common:
 	@echo DEPFLAGS=$(DEPFLAGS)
 	@echo CC=$(CC)
 	@echo AR=$(AR)
+	@echo AR_FLAGS=$(AR_FLAGS)
 	@echo RANLIB=$(RANLIB)
 
 print_bin: print_common
@@ -84,7 +85,7 @@ print_lib: print_common
 
 $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
 	if test ! -d $(LIBDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(LIBDIR)),$(HOST_MKDIR)); fi
-	$(AR) $(LIB) $(OBJS)
+	$(AR) $(AR_FLAGS) $(LIB) $(OBJS)
 	$(RANLIB) $(LIB)
 
 $(SHLIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP)
-- 
cgit v1.2.3