target.mk: check that CPU_TYPE has known CPU_CFLAGS mapping

[openwrt/openwrt.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 483a1510827b7496f53202ef615c71708c29de5c..5a403cbf41e2bbd6bdb843492639a01aff8cf75b 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -41,7 +41,7 @@ define Build/Configure/Default
        mkdir -p $(CMAKE_BINARY_DIR)
        (cd $(CMAKE_BINARY_DIR); \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-               CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+               CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
                cmake \
                        -DCMAKE_SYSTEM_NAME=Linux \
@@ -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