diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-11-18 17:17:38 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-11-18 17:17:38 +0000 |
| commit | ea929b1f8fe340dbb29f915049ea668b73d542b5 (patch) | |
| tree | 42d1b1f05a814d41d1910944499d211c0c0f54de /tools | |
| parent | 99617d71bad0e5870a38e37c8654e46868e2a5ba (diff) | |
| download | rockbox-ea929b1f8fe340dbb29f915049ea668b73d542b5.zip rockbox-ea929b1f8fe340dbb29f915049ea668b73d542b5.tar.gz rockbox-ea929b1f8fe340dbb29f915049ea668b73d542b5.tar.bz2 rockbox-ea929b1f8fe340dbb29f915049ea668b73d542b5.tar.xz | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 5 | ||||
| -rw-r--r-- | tools/rbspeex/Makefile | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/configure b/tools/configure index 0eb577f..8423482 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 06e1dd9..2e8a692 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 |