X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/31ff12316ab6415b66c75b39ad0cf499aa1eeaf3..5151e90913dea5fdd4626591637ef0b2127843bf:/include/cmake.mk diff --git a/include/cmake.mk b/include/cmake.mk index c83be1522..fd8ff2d12 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -3,10 +3,17 @@ PKG_INSTALL:=1 MAKE_FLAGS+=VERBOSE=1 ifeq ($(CONFIG_CCACHE),) + ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) CMAKE_C_COMPILER_ARG1:= CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX) CMAKE_CXX_COMPILER_ARG1:= + else + CMAKE_C_COMPILER:=$(shell which $(TARGET_CC)) + CMAKE_C_COMPILER_ARG1:= + CMAKE_CXX_COMPILER:=$(shell which $(TARGET_CXX)) + CMAKE_CXX_COMPILER_ARG1:= + endif else CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC)) @@ -38,6 +45,7 @@ define Build/Configure/Default -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=$(STAGING_DIR) \ -DCMAKE_STRIP=: \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DDL_LIBRARY=$(STAGING_DIR) \ $(CMAKE_OPTIONS) \ . \ )