From 28fbf6946ab2def73c780f138a5e9556c231936e Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 23 Apr 2012 16:10:25 +0000 Subject: [include] ensure that profile Makefiles are sourced in alphabetical order Since make 3.82 does not guarantee file ordering anymore, target profiles might get included in random order, leading to bad default values when only selecting the toplevel target and populating the .config with defconfig. This commit should also fix the ar71xx snapshot builds. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31449 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/target.mk') diff --git a/include/target.mk b/include/target.mk index 097b275cf..e5166fb78 100644 --- a/include/target.mk +++ b/include/target.mk @@ -84,12 +84,12 @@ endif ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR)) define IncludeProfiles - -include $(PLATFORM_DIR)/profiles/*.mk - -include $(PLATFORM_SUBDIR)/profiles/*.mk + -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk)) + -include $(sort $(wildcard $(PLATFORM_SUBDIR)/profiles/*.mk)) endef else define IncludeProfiles - -include $(PLATFORM_DIR)/profiles/*.mk + -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk)) endef endif -- cgit v1.2.3