Commit ed020099 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

toolchain: move makefile includes 



Including a bunch of Makefiles with wildcard makes it impossible to add
new toolchain backends. Avoid that by namely including needed files.

The external toolchain still needs to include all the toolchain/*/*.mk
sub-makefiles, as they are needed to build a toolchain that runs on the
target. It is to be noted that the cross-toolchain is not built in this
case, as the make-targets to build the cross-toolchain are not present
in the $(BASE_TARGETS) variable, which is later used to create the
dependency rules.

Also, the comment 'Explicit ordering' has been removed, as it is mis-
leading. It is make's responsibility to create the proper ordering based
on the dependency rules it finds in the Makefiles

Signed-off-by: default avatarYann E. MORIN <yann.morin.1998@anciens.enib.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent f78ea9fc

Makefile

+2 −14
Original line number Diff line number Diff line
@@ -294,21 +294,9 @@ all: world 
# each selected package to TARGETS if that package was selected

# in the .config file.

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

# avoid pulling in external toolchain which is broken for toplvl parallel builds

# 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-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

include toolchain/toolchain-buildroot.mk

else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)

include toolchain/helpers.mk

include toolchain/*/*.mk

include toolchain/toolchain-external.mk

endif



include package/*/*.mk

toolchain/toolchain-buildroot.mk

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# Include files required for the internal toolchain backend



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-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

toolchain/toolchain-external.mk

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# Required includes for the external toolchain backend



include toolchain/helpers.mk

include toolchain/binutils/binutils.mk

include toolchain/ccache/ccache.mk

include toolchain/dependencies/dependencies.mk

include toolchain/elf2flt/elf2flt.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/toolchain-external/ext-tool.mk

include toolchain/uClibc/uclibc.mk