From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 11 Apr 2011 02:11:11 +0000 (+0000)
Subject: cmake.mk: don't assume toolchain binaries in .../bin/ if an external toolchain is... 
X-Git-Tag: reboot~16938
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f13d0a0681a6dfd57cd4634ce62c7419438e87c;p=openwrt%2Fstaging%2Fblogic.git

cmake.mk: don't assume toolchain binaries in .../bin/ if an external toolchain is used, rely on `which` instead

SVN-Revision: 26584
---

diff --git a/include/cmake.mk b/include/cmake.mk
index c83be1522e17..22255acf590c 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))