X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fcmake.mk;h=900dae1d4afc6007f8ac04179dd7f0922a07d4fa;hb=01c2ce3c7d374c7e00562a7f3e54e87d23fef169;hp=5f572e9d7475e807ea56713ee2069dc98f5c1f6b;hpb=559fb537d83bc30fc2dfa783292b9f86712966d6;p=oweals%2Fopenwrt.git diff --git a/include/cmake.mk b/include/cmake.mk index 5f572e9d74..900dae1d4a 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -34,7 +34,7 @@ CMAKE_NM:=$(call cmake_tool,$(TARGET_NM)) CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB)) CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT)) -CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST) +CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST) CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions define Build/Configure/Default @@ -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