From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 20 Feb 2017 11:13:51 +0000 (+0100)
Subject: cmake: skip build system check on compile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=294e908a2cb53ab4ea34e202a31fc941a4825e16;p=openwrt%2Fstaging%2Fadrian.git

cmake: skip build system check on compile

cmake checks the build system and its variables on its own to detect if
the makefiles need to be regenerated.
Unfortunately this can invalidate overrides passed in the
Build/Configure step. On non-Linux systems this breaks the build when
switching between targets of the same package architecture.

Fix this by forcibly disabling the build system check and relying on the
LEDE build system to take care of these things

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/cmake.mk b/include/cmake.mk
index 80c1b05937..900dae1d4a 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -107,3 +107,7 @@ define Host/Configure/Default
 		$(HOST_CMAKE_SOURCE_DIR) \
 	)
 endef
+
+MAKE_FLAGS += \
+	CMAKE_COMMAND='$$(if $$(CMAKE_DISABLE_$$@),:,$(STAGING_DIR_HOST)/bin/cmake)' \
+	CMAKE_DISABLE_cmake_check_build_system=1