diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-04-11 02:11:11 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-04-11 02:11:11 +0000 |
| commit | 418fe28859b1b80f825687c933398623cba33a9a (patch) | |
| tree | 6044642edec9815a60d97e607ab27abe733c6c20 | |
| parent | b6ed543785eb78d06084fa37fbccc7d7083c6019 (diff) | |
| download | upstream-418fe28859b1b80f825687c933398623cba33a9a.tar.gz upstream-418fe28859b1b80f825687c933398623cba33a9a.tar.bz2 upstream-418fe28859b1b80f825687c933398623cba33a9a.zip | |
[include] cmake.mk: don't assume toolchain binaries in .../bin/ if an external toolchain is used, rely on `which` instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26584 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/cmake.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/cmake.mk b/include/cmake.mk index c83be1522e..22255acf59 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)) |