aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-20 12:13:51 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-21 13:03:20 +0100
commit294e908a2cb53ab4ea34e202a31fc941a4825e16 (patch)
tree4041f1344747cdcb5d5885964eb93c252ee957ed
parente313a3302414c7d4480596e5441857c8511f79e4 (diff)
downloadupstream-294e908a2cb53ab4ea34e202a31fc941a4825e16.tar.gz
upstream-294e908a2cb53ab4ea34e202a31fc941a4825e16.tar.bz2
upstream-294e908a2cb53ab4ea34e202a31fc941a4825e16.zip
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>
-rw-r--r--include/cmake.mk4
1 files changed, 4 insertions, 0 deletions
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