projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d5a890a
)
[include] cmake.mk: don't assume toolchain binaries in .../bin/ if an external toolch...
author
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 11 Apr 2011 02:11:11 +0000
(
02:11
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 11 Apr 2011 02:11:11 +0000
(
02:11
+0000)
SVN-Revision: 26584
include/cmake.mk
patch
|
blob
|
history
diff --git
a/include/cmake.mk
b/include/cmake.mk
index c83be1522e17a7032d1b6d50bf0afe6faabc2cd4..22255acf590c69e625543006b7036d3e690b0739 100644
(file)
--- a/
include/cmake.mk
+++ b/
include/cmake.mk
@@
-3,10
+3,17
@@
PKG_INSTALL:=1
MAKE_FLAGS+=VERBOSE=1
ifeq ($(CONFIG_CCACHE),)
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:=
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))
else
CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))