Forráskód Böngészése

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.

SVN-Revision: 31449
Jo-Philipp Wich 13 éve
szülő
commit
42c190ead8
1 módosított fájl, 3 hozzáadás és 3 törlés
  1. 3 3
      include/target.mk

+ 3 - 3
include/target.mk

@@ -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 $(PLATFORM_SUBDIR)/profiles/*.mk
+    -include $(sort $(wildcard $(PLATFORM_DIR)/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