aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Peter Seiderer <ps.report@gmx.net>2017-11-21 20:13:30 +0100
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2017-11-24 00:08:23 +0100
commitb9d2d4cb4ebc7a2290c4683dd9667b8f0a9e3cdf (patch)
tree3ce25e2d2dd30c4dd4ddb4ce94fc9bf2378f8bee /toolchain
parentca4009fc24e3a283fc44327dbd20579bde6cc323 (diff)
downloadbuildroot-b9d2d4cb4ebc7a2290c4683dd9667b8f0a9e3cdf.tar.gz
buildroot-b9d2d4cb4ebc7a2290c4683dd9667b8f0a9e3cdf.tar.bz2
Fix makefile include order by using sort/wildcard.
The 'include' directive in GNU make supports wildcards, but their expansion has no defined sort order (GLOB_NOSORT is passed to glob()). Usually this doesn't matter. However, there is at least one case where it does make a difference: toolchain/*/*.mk includes both the definitions of the external toolchain packages and pkg-toolchain-external.mk, but pkg-toolchain-external.mk must be included first. For predictability, use ordered 'include $(sort $(wildcard ...))' instead of unordered direct 'include */*.mk' everywhere. Fixes [1] reported by Petr Vorel: make: *** No rule to make target 'toolchain-external-custom', needed by '.../build/toolchain-external/.stamp_configured'. Stop. [1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html Signed-off-by: Peter Seiderer <ps.report@gmx.net> Tested-by: Petr Vorel <petr.vorel@gmail.com> [Arnout: also sort the one remaining include, of the external docs] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/toolchain-external/toolchain-external.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 48de1e71f2..dd07884c7e 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -25,4 +25,4 @@ $(error No prefix selected for external toolchain package $(BR2_PACKAGE_PROVIDES
endif
endif
-include toolchain/toolchain-external/*/*.mk
+include $(sort $(wildcard toolchain/toolchain-external/*/*.mk))