diff options
Diffstat (limited to 'include/cmake.mk')
| -rw-r--r-- | include/cmake.mk | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/cmake.mk b/include/cmake.mk index 4207a4dcee..009c6c2772 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -1,3 +1,5 @@ +cmake_bool = $(patsubst %,-D%:BOOL=$(if $($(1)),ON,OFF),$(2)) + PKG_INSTALL:=1 ifneq ($(findstring c,$(OPENWRT_VERBOSE)),) @@ -18,10 +20,7 @@ ifeq ($(CONFIG_CCACHE),) CMAKE_C_COMPILER_ARG1:= CMAKE_CXX_COMPILER_ARG1:= else - CCACHE:=$(shell which ccache) - ifeq ($(CCACHE),) - CCACHE:=$(STAGING_DIR_HOST)/bin/ccache - endif + CCACHE:=$(STAGING_DIR_HOST)/bin/ccache CMAKE_C_COMPILER:=$(CCACHE) CMAKE_C_COMPILER_ARG1:=$(TARGET_CC_NOCACHE) CMAKE_CXX_COMPILER:=$(CCACHE) @@ -31,8 +30,8 @@ CMAKE_AR:=$(call cmake_tool,$(TARGET_AR)) CMAKE_NM:=$(call cmake_tool,$(TARGET_NM)) CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB)) -CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR);$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT)) -CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR_HOST) +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_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions define Build/Configure/Default @@ -97,8 +96,8 @@ define Host/Configure/Default -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -DCMAKE_STRIP=: \ - -DCMAKE_INSTALL_PREFIX=$(STAGING_DIR_HOST) \ - -DCMAKE_PREFIX_PATH=$(STAGING_DIR_HOST) \ + -DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \ + -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \ -DCMAKE_SKIP_RPATH=TRUE \ $(CMAKE_HOST_OPTIONS) \ $(CMAKE_SOURCE_DIR) \ |