1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 02:48:26 +02:00

[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
This commit is contained in:
jow 2012-04-23 16:10:25 +00:00
parent fbad451aa0
commit 28fbf6946a

View File

@ -84,12 +84,12 @@ endif
ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR)) ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
define IncludeProfiles define IncludeProfiles
-include $(PLATFORM_DIR)/profiles/*.mk -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
-include $(PLATFORM_SUBDIR)/profiles/*.mk -include $(sort $(wildcard $(PLATFORM_SUBDIR)/profiles/*.mk))
endef endef
else else
define IncludeProfiles define IncludeProfiles
-include $(PLATFORM_DIR)/profiles/*.mk -include $(sort $(wildcard $(PLATFORM_DIR)/profiles/*.mk))
endef endef
endif endif