From 9d900775a7091909433d630ace7b99b22306f471 Mon Sep 17 00:00:00 2001
From: dave <dave@a1c6a512-1295-4272-9138-f99709370657>
Date: Sun, 18 Nov 2007 17:17:38 +0000
Subject: [PATCH] Revert r15664 and instead define a HOSTAR variable in the
 main Makefile and pass it to tools/Makefile, the same way CC is handled.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15669 a1c6a512-1295-4272-9138-f99709370657
---
 tools/configure        | 5 +++--
 tools/rbspeex/Makefile | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/configure b/tools/configure
index 0eb577f60..8423482b5 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1879,6 +1879,7 @@ export ENABLEDPLUGINS=@PLUGINS@
 export SOFTWARECODECS=@CODECS@
 export EXTRA_DEFINES=@EXTRADEF@
 export HOSTCC=gcc
+export HOSTAR=ar
 export CC=@CC@
 export LD=@LD@
 export AR=@AR@
@@ -1944,10 +1945,10 @@ clean:
 	          voicefontids *.wav *.mp3 *.voice
 
 tools:
-	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
+	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@
 
 voicetools:
-	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @VOICETOOLSET@
+	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @VOICETOOLSET@
 
 tags:
 	\$(SILENT)rm -f TAGS
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 06e1dd941..2e8a692c3 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -51,7 +51,7 @@ $(DEPFILE): $(SOURCES)
 
 libspeex.a: $(OBJS) $(DEPFILE)
 	@echo AR libspeex.a
-	$(SILENT)ar ruv $@ $+ > /dev/null 2>&1
+	$(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1
 
 ../rbspeexenc: $(OBJS) libspeex.a rbspeexenc.o
 	@echo Linking ../rbspeexenc
-- 
2.11.4.GIT