From 59da607e12842ade0785d8c2659d481d10ff5904 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 3 Mar 2019 09:56:11 +0000
Subject: [PATCH] defs.mk, platform.mk: Include pre-local.mk and cache.mk from
 platform.mk

platform.mk is sometimes included before defs.mk, e.g. from
$(TOPDIR)/make/proj.mk, then these definitions are necessary

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs.mk     | 13 -------------
 make/platform.mk | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 344eba39..6a649509 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -7,19 +7,6 @@ JW_BUILD_DEF_MK_INCLUDED = true
 
 MAKEFLAGS             += -r
 
-# "-include" tries search path, we don't want that
-define try_include
-  ifneq ($$(wildcard $(1)),)
-    include $(1)
-  endif
-endef
-
-$(eval $(call try_include,$(MODDIR)/make/.cache.mk))
-$(eval $(call try_include,$(TOPDIR)/make/.cache.mk))
-$(eval $(call try_include,$(MODDIR)/make/pre-local.mk))
-$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
-$(eval $(call try_include,pre-local.mk))
-
 include $(MODDIR)/make/projects.mk
 
 ifeq ($(MAKE_BENCHMARK),true)
diff --git a/make/platform.mk b/make/platform.mk
index 6cf45915..1d339de9 100644
--- a/make/platform.mk
+++ b/make/platform.mk
@@ -3,6 +3,19 @@
 ifndef PLATFORM_MK_INCLUDED
 PLATFORM_MK_INCLUDED = true
 
+# "-include" tries search path, we don't want that
+define try_include
+  ifneq ($$(wildcard $(1)),)
+    include $(1)
+  endif
+endef
+
+$(eval $(call try_include,$(MODDIR)/make/.cache.mk))
+$(eval $(call try_include,$(TOPDIR)/make/.cache.mk))
+$(eval $(call try_include,$(MODDIR)/make/pre-local.mk))
+$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
+$(eval $(call try_include,pre-local.mk))
+
 ifndef TARGET
   ifneq ($(subst mingw,,$(CWD)),$(CWD))
     TARGET                := mingw