cmake.mk: don't assume toolchain binaries in .../bin/ if an external toolchain is...
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 11 Apr 2011 02:11:11 +0000 (02:11 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 11 Apr 2011 02:11:11 +0000 (02:11 +0000)
SVN-Revision: 26584

include/cmake.mk

index c83be15..22255ac 100644 (file)
@@ -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))