--- tools/configure.orig	2008-02-20 06:00:16.000000000 +0100
+++ tools/configure	2008-02-21 19:35:38.000000000 +0100
@@ -1957,26 +1957,26 @@
 # Do not print "Entering directory ..."
 MAKEFLAGS += --no-print-directory
 
-.PHONY: all clean tags zip tools manual bin build info langs
+.PHONY: all clean tags zip tools manual bin build info @LANGS@ @TOOLSET@
 
 all: info
 
 info: build
 	\$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt
 
-build: tools @LANGS@
+build: @TOOLSET@ @LANGS@
 	@SIMUL1@
 	@SIMUL2@
 	\$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
 	\$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@
 
-bin: tools @LANGS@
+bin: @TOOLSET@ @LANGS@
 	@SIMUL1@
 	@SIMUL2@
 	\$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware
 	\$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ \$(BUILDDIR)/\$(BINARY)
 
-rocks: tools
+rocks: @TOOLSET@
 	\$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ rocks
 
 veryclean: clean toolsclean
@@ -1992,8 +1992,7 @@
 	          html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
 	          voicefontids *.wav *.mp3 *.voice max_language_size.h
 
-tools:
-	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@
+tools: @TOOLSET@
 
 voicetools:
 	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @VOICETOOLSET@
@@ -2079,6 +2078,15 @@
 
 EOF
 
+for i in $toolset; do
+ cat >> Makefile <<EOF
+
+$i:
+	\$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) $i
+EOF
+
+done
+
 if [ "yes" = "$simulator" ]; then
 
  cat >> Makefile <<EOF