forked from len0rd/rockbox
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
This commit is contained in:
parent
99617d71ba
commit
ea929b1f8f
2 changed files with 4 additions and 3 deletions
5
tools/configure
vendored
5
tools/configure
vendored
|
|
@ -1879,6 +1879,7 @@ export ENABLEDPLUGINS=@PLUGINS@
|
||||||
export SOFTWARECODECS=@CODECS@
|
export SOFTWARECODECS=@CODECS@
|
||||||
export EXTRA_DEFINES=@EXTRADEF@
|
export EXTRA_DEFINES=@EXTRADEF@
|
||||||
export HOSTCC=gcc
|
export HOSTCC=gcc
|
||||||
|
export HOSTAR=ar
|
||||||
export CC=@CC@
|
export CC=@CC@
|
||||||
export LD=@LD@
|
export LD=@LD@
|
||||||
export AR=@AR@
|
export AR=@AR@
|
||||||
|
|
@ -1944,10 +1945,10 @@ clean:
|
||||||
voicefontids *.wav *.mp3 *.voice
|
voicefontids *.wav *.mp3 *.voice
|
||||||
|
|
||||||
tools:
|
tools:
|
||||||
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@
|
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@
|
||||||
|
|
||||||
voicetools:
|
voicetools:
|
||||||
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @VOICETOOLSET@
|
\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @VOICETOOLSET@
|
||||||
|
|
||||||
tags:
|
tags:
|
||||||
\$(SILENT)rm -f TAGS
|
\$(SILENT)rm -f TAGS
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ $(DEPFILE): $(SOURCES)
|
||||||
|
|
||||||
libspeex.a: $(OBJS) $(DEPFILE)
|
libspeex.a: $(OBJS) $(DEPFILE)
|
||||||
@echo AR libspeex.a
|
@echo AR libspeex.a
|
||||||
$(SILENT)ar ruv $@ $+ > /dev/null 2>&1
|
$(SILENT)$(AR) ruv $@ $+ > /dev/null 2>&1
|
||||||
|
|
||||||
../rbspeexenc: $(OBJS) libspeex.a rbspeexenc.o
|
../rbspeexenc: $(OBJS) libspeex.a rbspeexenc.o
|
||||||
@echo Linking ../rbspeexenc
|
@echo Linking ../rbspeexenc
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue