- for various reasons i will need an explicit ordering of the toolchain includes

diff --git a/Makefile b/Makefile
index a7d7f04d25ae03055219c00baf3031c310e7ba45..23107a189de0ab4eead712e27047823a23f003f4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,18 @@ include project/*.mk
 # in the .config file.
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
 # avoid pulling in external toolchain which is broken for toplvl parallel builds
-include $(filter-out $(wildcard toolchain/external-toolchain/*),$(wildcard toolchain/*/*.mk))
+# Explicit ordering:
+include toolchain/dependencies/dependencies.mk
+include toolchain/binutils/binutils.mk
+include toolchain/ccache/ccache.mk
+include toolchain/elf2flt/elf2flt.mk
+include toolchain/gcc/gcc-uclibc-3.x.mk
+include toolchain/gcc/gcc-uclibc-4.x.mk
+include toolchain/gdb/gdb.mk
+include toolchain/kernel-headers/kernel-headers.mk
+include toolchain/mklibs/mklibs.mk
+include toolchain/sstrip/sstrip.mk
+include toolchain/uClibc/uclibc.mk
 else
 include toolchain/*/*.mk
 endif